You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by mo...@apache.org on 2017/09/01 13:17:49 UTC

[51/64] [partial] knox git commit: KNOX-998 - Refactoring save 1

KNOX-998 - Refactoring save 1


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/af9b0c3d
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/af9b0c3d
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/af9b0c3d

Branch: refs/heads/KNOX-998-Package_Restructuring
Commit: af9b0c3d1ce18f787ccf5c5d2055c2da98e70711
Parents: 1159135
Author: Sandeep More <mo...@apache.org>
Authored: Thu Aug 24 10:56:35 2017 -0400
Committer: Sandeep More <mo...@apache.org>
Committed: Thu Aug 24 10:56:35 2017 -0400

----------------------------------------------------------------------
 .../applications/knoxauth/app/redirecting.jsp   |     6 +-
 gateway-demo-ldap-launcher/pom.xml              |     2 +-
 .../security/ldap/BaseDirectoryService.java     |  2323 ----
 .../ldap/BaseDirectoryServiceFactory.java       |   290 -
 .../security/ldap/SimpleDirectoryService.java   |    29 -
 .../ldap/SimpleDirectoryServiceFactory.java     |    34 -
 .../ldap/SimpleLdapDirectoryServer.java         |   124 -
 .../security/ldap/BaseDirectoryService.java     |  2323 ++++
 .../ldap/BaseDirectoryServiceFactory.java       |   290 +
 .../security/ldap/SimpleDirectoryService.java   |    29 +
 .../ldap/SimpleDirectoryServiceFactory.java     |    34 +
 .../ldap/SimpleLdapDirectoryServer.java         |   124 +
 .../security/ldap/SimpleLdapServerTest.java     |    93 -
 .../security/ldap/SimpleLdapServerTest.java     |    91 +
 .../loggers/log4j/Log4jMessageLogger.java       |    87 -
 .../log4j/Log4jMessageLoggerFactory.java        |    31 -
 .../loggers/log4j/Log4jMessageLogger.java       |    87 +
 .../log4j/Log4jMessageLoggerFactory.java        |    31 +
 ...p.gateway.i18n.messages.MessageLoggerFactory |    19 -
 ...x.gateway.i18n.messages.MessageLoggerFactory |    19 +
 .../log4j/Log4jMessageLoggerFactoryTest.java    |    45 -
 .../log4j/Log4jMessageLoggerFactoryTest.java    |    45 +
 .../loggers/sl4j/Sl4jMessageLogger.java         |    82 -
 .../loggers/sl4j/Sl4jMessageLoggerFactory.java  |    31 -
 .../loggers/sl4j/Sl4jMessageLogger.java         |    82 +
 .../loggers/sl4j/Sl4jMessageLoggerFactory.java  |    31 +
 ...p.gateway.i18n.messages.MessageLoggerFactory |    19 -
 ...x.gateway.i18n.messages.MessageLoggerFactory |    19 +
 .../sl4j/Sl4jMessageLoggerFactoryTest.java      |    45 -
 .../sl4j/Sl4jMessageLoggerFactoryTest.java      |    45 +
 .../hadoop/gateway/i18n/messages/Message.java   |    36 -
 .../gateway/i18n/messages/MessageLevel.java     |    25 -
 .../gateway/i18n/messages/MessageLogger.java    |    29 -
 .../i18n/messages/MessageLoggerFactory.java     |    27 -
 .../hadoop/gateway/i18n/messages/Messages.java  |    37 -
 .../gateway/i18n/messages/MessagesFactory.java  |    65 -
 .../gateway/i18n/messages/MessagesInvoker.java  |   173 -
 .../gateway/i18n/messages/StackTrace.java       |    32 -
 .../messages/loggers/jdk/JdkMessageLogger.java  |    67 -
 .../loggers/jdk/JdkMessageLoggerFactory.java    |    35 -
 .../loggers/sout/SoutMessageLogger.java         |    56 -
 .../loggers/sout/SoutMessageLoggerFactory.java  |    56 -
 .../loggers/test/TestMessageLogger.java         |    55 -
 .../loggers/test/TestMessageLoggerFactory.java  |    55 -
 .../loggers/test/TestMessageRecord.java         |    67 -
 .../hadoop/gateway/i18n/resources/Resource.java |    33 -
 .../gateway/i18n/resources/Resources.java       |    33 -
 .../i18n/resources/ResourcesFactory.java        |    46 -
 .../i18n/resources/ResourcesInvoker.java        |   162 -
 .../knox/gateway/i18n/messages/Message.java     |    36 +
 .../gateway/i18n/messages/MessageLevel.java     |    25 +
 .../gateway/i18n/messages/MessageLogger.java    |    29 +
 .../i18n/messages/MessageLoggerFactory.java     |    27 +
 .../knox/gateway/i18n/messages/Messages.java    |    37 +
 .../gateway/i18n/messages/MessagesFactory.java  |    63 +
 .../gateway/i18n/messages/MessagesInvoker.java  |   173 +
 .../knox/gateway/i18n/messages/StackTrace.java  |    32 +
 .../messages/loggers/jdk/JdkMessageLogger.java  |    67 +
 .../loggers/jdk/JdkMessageLoggerFactory.java    |    35 +
 .../loggers/sout/SoutMessageLogger.java         |    56 +
 .../loggers/sout/SoutMessageLoggerFactory.java  |    55 +
 .../loggers/test/TestMessageLogger.java         |    55 +
 .../loggers/test/TestMessageLoggerFactory.java  |    55 +
 .../loggers/test/TestMessageRecord.java         |    67 +
 .../knox/gateway/i18n/resources/Resource.java   |    33 +
 .../knox/gateway/i18n/resources/Resources.java  |    33 +
 .../i18n/resources/ResourcesFactory.java        |    46 +
 .../i18n/resources/ResourcesInvoker.java        |   162 +
 .../gateway/i18n/messages/MessagesTest.java     |    54 -
 .../i18n/messages/MessagesTestSubject.java      |    46 -
 .../gateway/i18n/resources/ResourcesTest.java   |   121 -
 .../ResourcesTestFormattingSubject.java         |    47 -
 .../resources/ResourcesTestLocaleSubject.java   |    29 -
 .../resources/ResourcesTestNamedSubject.java    |    29 -
 .../gateway/i18n/messages/MessagesTest.java     |    54 +
 .../i18n/messages/MessagesTestSubject.java      |    43 +
 .../gateway/i18n/resources/ResourcesTest.java   |   121 +
 .../ResourcesTestFormattingSubject.java         |    47 +
 .../resources/ResourcesTestLocaleSubject.java   |    29 +
 .../resources/ResourcesTestNamedSubject.java    |    29 +
 ...p.gateway.i18n.messages.MessageLoggerFactory |    17 -
 ...x.gateway.i18n.messages.MessageLoggerFactory |    17 +
 .../i18n/resources/NamedBundle_en_CA.properties |    19 -
 .../ResourcesTestLocaleSubject.properties       |    14 -
 .../ResourcesTestLocaleSubject_en.properties    |    19 -
 .../ResourcesTestLocaleSubject_en_GB.properties |    19 -
 .../ResourcesTestLocaleSubject_en_US.properties |    19 -
 .../i18n/resources/NamedBundle_en_CA.properties |    19 +
 .../ResourcesTestLocaleSubject.properties       |    14 +
 .../ResourcesTestLocaleSubject_en.properties    |    19 +
 .../ResourcesTestLocaleSubject_en_GB.properties |    19 +
 .../ResourcesTestLocaleSubject_en_US.properties |    19 +
 .../deploy/HaProviderDeploymentContributor.java |    98 -
 .../gateway/ha/dispatch/DefaultHaDispatch.java  |   130 -
 .../ha/dispatch/i18n/HaDispatchMessages.java    |    41 -
 .../gateway/ha/provider/HaDescriptor.java       |    34 -
 .../hadoop/gateway/ha/provider/HaProvider.java  |    67 -
 .../gateway/ha/provider/HaServiceConfig.java    |    53 -
 .../ha/provider/HaServletContextListener.java   |   116 -
 .../hadoop/gateway/ha/provider/URLManager.java  |    37 -
 .../gateway/ha/provider/URLManagerLoader.java   |    43 -
 .../ha/provider/impl/DefaultHaDescriptor.java   |    71 -
 .../ha/provider/impl/DefaultHaProvider.java     |    96 -
 .../provider/impl/DefaultHaServiceConfig.java   |   124 -
 .../ha/provider/impl/DefaultURLManager.java     |   101 -
 .../provider/impl/HS2ZookeeperURLManager.java   |   145 -
 .../ha/provider/impl/HaDescriptorConstants.java |    49 -
 .../ha/provider/impl/HaDescriptorFactory.java   |    94 -
 .../ha/provider/impl/HaDescriptorManager.java   |   109 -
 .../provider/impl/HaServiceConfigConstants.java |    50 -
 .../ha/provider/impl/i18n/HaMessages.java       |    45 -
 .../deploy/HaProviderDeploymentContributor.java |    98 +
 .../gateway/ha/dispatch/DefaultHaDispatch.java  |   130 +
 .../ha/dispatch/i18n/HaDispatchMessages.java    |    41 +
 .../knox/gateway/ha/provider/HaDescriptor.java  |    34 +
 .../knox/gateway/ha/provider/HaProvider.java    |    67 +
 .../gateway/ha/provider/HaServiceConfig.java    |    53 +
 .../ha/provider/HaServletContextListener.java   |   116 +
 .../knox/gateway/ha/provider/URLManager.java    |    37 +
 .../gateway/ha/provider/URLManagerLoader.java   |    43 +
 .../ha/provider/impl/DefaultHaDescriptor.java   |    71 +
 .../ha/provider/impl/DefaultHaProvider.java     |    96 +
 .../provider/impl/DefaultHaServiceConfig.java   |   124 +
 .../ha/provider/impl/DefaultURLManager.java     |   100 +
 .../provider/impl/HS2ZookeeperURLManager.java   |   145 +
 .../ha/provider/impl/HaDescriptorConstants.java |    49 +
 .../ha/provider/impl/HaDescriptorFactory.java   |    94 +
 .../ha/provider/impl/HaDescriptorManager.java   |   109 +
 .../provider/impl/HaServiceConfigConstants.java |    50 +
 .../ha/provider/impl/i18n/HaMessages.java       |    45 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...apache.hadoop.gateway.ha.provider.URLManager |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...g.apache.knox.gateway.ha.provider.URLManager |    19 +
 .../HaProviderDeploymentContributorTest.java    |    46 -
 .../ha/dispatch/DefaultHaDispatchTest.java      |   106 -
 .../ha/provider/impl/DefaultHaProviderTest.java |    85 -
 .../ha/provider/impl/DefaultURLManagerTest.java |    73 -
 .../impl/HS2ZookeeperURLManagerTest.java        |   134 -
 .../provider/impl/HaDescriptorFactoryTest.java  |    53 -
 .../provider/impl/HaDescriptorManagerTest.java  |    89 -
 .../ha/provider/impl/MockURLManager.java        |    40 -
 .../ha/provider/impl/URLManagerLoaderTest.java  |    48 -
 .../HaProviderDeploymentContributorTest.java    |    46 +
 .../ha/dispatch/DefaultHaDispatchTest.java      |   106 +
 .../ha/provider/impl/DefaultHaProviderTest.java |    85 +
 .../ha/provider/impl/DefaultURLManagerTest.java |    73 +
 .../impl/HS2ZookeeperURLManagerTest.java        |   133 +
 .../provider/impl/HaDescriptorFactoryTest.java  |    53 +
 .../provider/impl/HaDescriptorManagerTest.java  |    89 +
 .../ha/provider/impl/MockURLManager.java        |    40 +
 .../ha/provider/impl/URLManagerLoaderTest.java  |    48 +
 ...apache.hadoop.gateway.ha.provider.URLManager |    19 -
 ...g.apache.knox.gateway.ha.provider.URLManager |    19 +
 .../gateway/IdentityAsserterMessages.java       |    31 -
 ...ctIdentityAsserterDeploymentContributor.java |    60 -
 .../filter/AbstractIdentityAssertionFilter.java |   198 -
 .../filter/CommonIdentityAssertionFilter.java   |   144 -
 ...entityAsserterHttpServletRequestWrapper.java |   294 -
 .../function/UsernameFunctionDescriptor.java    |    31 -
 .../function/UsernameFunctionProcessor.java     |    74 -
 .../knox/gateway/IdentityAsserterMessages.java  |    31 +
 ...ctIdentityAsserterDeploymentContributor.java |    61 +
 .../filter/AbstractIdentityAssertionFilter.java |   198 +
 .../filter/CommonIdentityAssertionFilter.java   |   143 +
 ...entityAsserterHttpServletRequestWrapper.java |   295 +
 .../function/UsernameFunctionDescriptor.java    |    32 +
 .../function/UsernameFunctionProcessor.java     |    72 +
 ...gateway.deploy.ProviderDeploymentContributor |    18 -
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    19 -
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    18 +
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    19 +
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    19 +
 .../CommonIdentityAssertionFilterTest.java      |   130 -
 ...yAssertionHttpServletRequestWrapperTest.java |   279 -
 .../UsernameFunctionDescriptorTest.java         |    52 -
 .../function/UsernameFunctionProcessorTest.java |   248 -
 .../CommonIdentityAssertionFilterTest.java      |   130 +
 ...yAssertionHttpServletRequestWrapperTest.java |   279 +
 .../UsernameFunctionDescriptorTest.java         |    52 +
 .../function/UsernameFunctionProcessorTest.java |   247 +
 .../UsernameFunctionProcessorTest/rewrite.xml   |    24 -
 .../UsernameFunctionProcessorTest/rewrite.xml   |    24 +
 .../gateway/ConcatIdentityAsserterMessages.java |    31 -
 ...atIdentityAsserterDeploymentContributor.java |    32 -
 .../filter/ConcatIdentityAssertionFilter.java   |    61 -
 .../gateway/ConcatIdentityAsserterMessages.java |    31 +
 ...atIdentityAsserterDeploymentContributor.java |    32 +
 .../filter/ConcatIdentityAssertionFilter.java   |    61 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...entityAsserterDeploymentContributorTest.java |    45 -
 .../ConcatIdentityAssertionFilterTest.java      |    97 -
 ...entityAsserterDeploymentContributorTest.java |    44 +
 .../ConcatIdentityAssertionFilterTest.java      |    97 +
 ...adoopGroupProviderDeploymentContributor.java |    64 -
 .../filter/HadoopGroupProviderFilter.java       |   121 -
 .../filter/HadoopGroupProviderMessages.java     |    43 -
 ...adoopGroupProviderDeploymentContributor.java |    64 +
 .../filter/HadoopGroupProviderFilter.java       |   121 +
 .../filter/HadoopGroupProviderMessages.java     |    43 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...pGroupProviderDeploymentContributorTest.java |    54 -
 .../filter/HadoopGroupProviderFilterTest.java   |   218 -
 .../hadoop/groups/filter/HadoopGroupsTest.java  |    85 -
 ...pGroupProviderDeploymentContributorTest.java |    54 +
 .../filter/HadoopGroupProviderFilterTest.java   |   218 +
 .../hadoop/groups/filter/HadoopGroupsTest.java  |    85 +
 .../gateway/IdentityAsserterMessages.java       |    31 -
 ...ltIdentityAsserterDeploymentContributor.java |    32 -
 .../IdentityAsserterDeploymentContributor.java  |    58 -
 .../filter/IdentityAsserterFilter.java          |    42 -
 .../knox/gateway/IdentityAsserterMessages.java  |    31 +
 ...ltIdentityAsserterDeploymentContributor.java |    32 +
 .../IdentityAsserterDeploymentContributor.java  |    52 +
 .../filter/IdentityAsserterFilter.java          |    42 +
 ...gateway.deploy.ProviderDeploymentContributor |    20 -
 ...gateway.deploy.ProviderDeploymentContributor |    20 +
 .../DefaultIdentityAssertionFilterTest.java     |   173 -
 .../DefaultIdentityAssertionFilterTest.java     |   173 +
 .../UsernameFunctionProcessorTest/rewrite.xml   |    24 -
 .../UsernameFunctionProcessorTest/rewrite.xml   |    24 +
 ...exIdentityAsserterDeploymentContributor.java |    33 -
 .../filter/RegexIdentityAssertionFilter.java    |    87 -
 .../regex/filter/RegexTemplate.java             |    75 -
 ...exIdentityAsserterDeploymentContributor.java |    34 +
 .../filter/RegexIdentityAssertionFilter.java    |    88 +
 .../regex/filter/RegexTemplate.java             |    75 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...entityAsserterDeploymentContributorTest.java |    44 -
 .../RegexIdentityAssertionFilterTest.java       |   130 -
 .../regex/filter/RegexTemplateTest.java         |    72 -
 ...entityAsserterDeploymentContributorTest.java |    44 +
 .../RegexIdentityAssertionFilterTest.java       |   130 +
 .../regex/filter/RegexTemplateTest.java         |    72 +
 ...seIdentityAsserterDeploymentContributor.java |    32 -
 .../SwitchCaseIdentityAssertionFilter.java      |    97 -
 ...seIdentityAsserterDeploymentContributor.java |    33 +
 .../SwitchCaseIdentityAssertionFilter.java      |    98 +
 ...gateway.deploy.ProviderDeploymentContributor |    18 -
 ...gateway.deploy.ProviderDeploymentContributor |    18 +
 ...entityAsserterDeploymentContributorTest.java |    44 -
 .../SwitchCaseIdentityAssertionFilterTest.java  |   242 -
 ...entityAsserterDeploymentContributorTest.java |    44 +
 .../SwitchCaseIdentityAssertionFilterTest.java  |   242 +
 .../JerseyDispatchDeploymentContributor.java    |    55 -
 .../JerseyServiceDeploymentContributorBase.java |    67 -
 .../JerseyDispatchDeploymentContributor.java    |    56 +
 .../JerseyServiceDeploymentContributorBase.java |    67 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../jersey/JerseyDeploymentContributorTest.java |   259 -
 .../jersey/JerseyDeploymentContributorTest.java |   259 +
 .../hostmap/api/HostmapFunctionDescriptor.java  |    50 -
 .../impl/HostmapDeploymentContributor.java      |    99 -
 .../hostmap/impl/HostmapFunctionProcessor.java  |    91 -
 .../hostmap/api/HostmapFunctionDescriptor.java  |    51 +
 .../impl/HostmapDeploymentContributor.java      |    99 +
 .../hostmap/impl/HostmapFunctionProcessor.java  |    92 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    19 -
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    19 +
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    19 +
 .../api/HostmapFunctionDescriptorTest.java      |    65 -
 .../impl/HostmapDeploymentContributorTest.java  |   102 -
 .../impl/HostmapFunctionProcessorTest.java      |   274 -
 .../api/HostmapFunctionDescriptorTest.java      |    65 +
 .../impl/HostmapDeploymentContributorTest.java  |   102 +
 .../impl/HostmapFunctionProcessorTest.java      |   274 +
 .../empty-hostmap.txt                           |    15 -
 .../hdfs-hostmap.txt                            |    17 -
 .../HostmapFunctionProcessorTest/hostmap.txt    |    17 -
 .../empty-hostmap.txt                           |    15 +
 .../hdfs-hostmap.txt                            |    17 +
 .../HostmapFunctionProcessorTest/hostmap.txt    |    17 +
 .../api/InboundUrlFunctionDescriptor.java       |    31 -
 .../impl/InboundUrlFunctionProcessor.java       |    60 -
 .../api/InboundUrlFunctionDescriptor.java       |    31 +
 .../impl/InboundUrlFunctionProcessor.java       |    60 +
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    19 -
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    19 -
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    19 +
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    19 +
 .../api/InboundUrlFunctionDescriptorTest.java   |    48 -
 .../impl/InboundUrlFunctionProcessorTest.java   |   140 -
 .../api/InboundUrlFunctionDescriptorTest.java   |    48 +
 .../impl/InboundUrlFunctionProcessorTest.java   |   140 +
 .../api/ServiceAddressFunctionDescriptor.java   |    31 -
 .../api/ServiceHostFunctionDescriptor.java      |    31 -
 .../ServiceMappedAddressFunctionDescriptor.java |    31 -
 .../ServiceMappedHostFunctionDescriptor.java    |    31 -
 .../api/ServiceMappedUrlFunctionDescriptor.java |    31 -
 .../api/ServicePathFunctionDescriptor.java      |    31 -
 .../api/ServicePortFunctionDescriptor.java      |    31 -
 .../api/ServiceSchemeFunctionDescriptor.java    |    31 -
 .../api/ServiceUrlFunctionDescriptor.java       |    31 -
 .../impl/ServiceAddressFunctionProcessor.java   |    84 -
 .../impl/ServiceHostFunctionProcessor.java      |    60 -
 .../ServiceMappedAddressFunctionProcessor.java  |   110 -
 .../ServiceMappedHostFunctionProcessor.java     |    87 -
 .../impl/ServiceMappedUrlFunctionProcessor.java |    90 -
 .../impl/ServicePathFunctionProcessor.java      |    72 -
 .../impl/ServicePortFunctionProcessor.java      |    60 -
 .../ServiceRegistryFunctionProcessorBase.java   |    81 -
 .../impl/ServiceSchemeFunctionProcessor.java    |    60 -
 .../impl/ServiceUrlFunctionProcessor.java       |    64 -
 .../api/ServiceAddressFunctionDescriptor.java   |    32 +
 .../api/ServiceHostFunctionDescriptor.java      |    32 +
 .../ServiceMappedAddressFunctionDescriptor.java |    31 +
 .../ServiceMappedHostFunctionDescriptor.java    |    32 +
 .../api/ServiceMappedUrlFunctionDescriptor.java |    32 +
 .../api/ServicePathFunctionDescriptor.java      |    31 +
 .../api/ServicePortFunctionDescriptor.java      |    32 +
 .../api/ServiceSchemeFunctionDescriptor.java    |    32 +
 .../api/ServiceUrlFunctionDescriptor.java       |    32 +
 .../impl/ServiceAddressFunctionProcessor.java   |    84 +
 .../impl/ServiceHostFunctionProcessor.java      |    60 +
 .../ServiceMappedAddressFunctionProcessor.java  |   109 +
 .../ServiceMappedHostFunctionProcessor.java     |    88 +
 .../impl/ServiceMappedUrlFunctionProcessor.java |    90 +
 .../impl/ServicePathFunctionProcessor.java      |    72 +
 .../impl/ServicePortFunctionProcessor.java      |    60 +
 .../ServiceRegistryFunctionProcessorBase.java   |    81 +
 .../impl/ServiceSchemeFunctionProcessor.java    |    60 +
 .../impl/ServiceUrlFunctionProcessor.java       |    64 +
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    27 -
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    27 -
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    27 +
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    27 +
 .../ServiceAddressFunctionDescriptorTest.java   |    52 -
 .../api/ServiceHostFunctionDescriptorTest.java  |    52 -
 .../api/ServicePathFunctionDescriptorTest.java  |    52 -
 .../api/ServicePortFunctionDescriptorTest.java  |    52 -
 .../ServiceSchemeFunctionDescriptorTest.java    |    52 -
 .../api/ServiceUrlFunctionDescriptorTest.java   |    52 -
 .../ServiceAddressFunctionProcessorTest.java    |   140 -
 .../impl/ServiceHostFunctionProcessorTest.java  |   141 -
 ...rviceMappedAddressFunctionProcessorTest.java |   153 -
 .../ServiceMappedHostFunctionProcessorTest.java |   153 -
 .../ServiceMappedUrlFunctionProcessorTest.java  |   154 -
 .../impl/ServicePathFunctionProcessorTest.java  |   140 -
 .../impl/ServicePortFunctionProcessorTest.java  |   140 -
 .../impl/ServiceRegistryFunctionsTest.java      |   226 -
 .../ServiceSchemeFunctionProcessorTest.java     |   140 -
 .../impl/ServiceUrlFunctionProcessorTest.java   |   153 -
 .../ServiceAddressFunctionDescriptorTest.java   |    52 +
 .../api/ServiceHostFunctionDescriptorTest.java  |    52 +
 .../api/ServicePathFunctionDescriptorTest.java  |    52 +
 .../api/ServicePortFunctionDescriptorTest.java  |    52 +
 .../ServiceSchemeFunctionDescriptorTest.java    |    52 +
 .../api/ServiceUrlFunctionDescriptorTest.java   |    52 +
 .../ServiceAddressFunctionProcessorTest.java    |   140 +
 .../impl/ServiceHostFunctionProcessorTest.java  |   141 +
 ...rviceMappedAddressFunctionProcessorTest.java |   153 +
 .../ServiceMappedHostFunctionProcessorTest.java |   153 +
 .../ServiceMappedUrlFunctionProcessorTest.java  |   154 +
 .../impl/ServicePathFunctionProcessorTest.java  |   140 +
 .../impl/ServicePortFunctionProcessorTest.java  |   140 +
 .../impl/ServiceRegistryFunctionsTest.java      |   225 +
 .../ServiceSchemeFunctionProcessorTest.java     |   140 +
 .../impl/ServiceUrlFunctionProcessorTest.java   |   153 +
 .../ServiceRegistryFunctionsTest/rewrite.xml    |   101 -
 .../test-expect-body.json                       |    11 -
 .../test-expect-body.xml                        |    40 -
 .../test-input-body.json                        |    11 -
 .../test-input-body.xml                         |    40 -
 .../ServiceRegistryFunctionsTest/rewrite.xml    |   101 +
 .../test-expect-body.json                       |    11 +
 .../test-expect-body.xml                        |    40 +
 .../test-input-body.json                        |    11 +
 .../test-input-body.xml                         |    40 +
 .../encrypturi/EncryptStepContextParams.java    |    47 -
 .../gateway/encrypturi/EncryptUriMessages.java  |    31 -
 .../encrypturi/api/DecryptUriDescriptor.java    |    39 -
 .../encrypturi/api/EncryptUriDescriptor.java    |    49 -
 .../encrypturi/impl/DecryptUriProcessor.java    |    89 -
 .../impl/EncryptUriDeploymentContributor.java   |    87 -
 .../encrypturi/impl/EncryptUriProcessor.java    |    85 -
 .../encrypturi/EncryptStepContextParams.java    |    47 +
 .../gateway/encrypturi/EncryptUriMessages.java  |    31 +
 .../encrypturi/api/DecryptUriDescriptor.java    |    39 +
 .../encrypturi/api/EncryptUriDescriptor.java    |    49 +
 .../encrypturi/impl/DecryptUriProcessor.java    |    90 +
 .../impl/EncryptUriDeploymentContributor.java   |    87 +
 .../encrypturi/impl/EncryptUriProcessor.java    |    86 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ....filter.rewrite.api.UrlRewriteStepDescriptor |    20 -
 ...y.filter.rewrite.spi.UrlRewriteStepProcessor |    20 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ....filter.rewrite.api.UrlRewriteStepDescriptor |    20 +
 ...y.filter.rewrite.spi.UrlRewriteStepProcessor |    20 +
 .../api/DecryptUriDescriptorTest.java           |    55 -
 .../api/EncryptUriDescriptorTest.java           |    55 -
 .../impl/EncryptDecryptUriProcessorTest.java    |   157 -
 .../EncryptUriDeploymentContributorTest.java    |   105 -
 .../api/DecryptUriDescriptorTest.java           |    55 +
 .../api/EncryptUriDescriptorTest.java           |    55 +
 .../impl/EncryptDecryptUriProcessorTest.java    |   157 +
 .../EncryptUriDeploymentContributorTest.java    |   105 +
 .../SecureQueryDecodeDescriptor.java            |    38 -
 .../securequery/SecureQueryDecodeProcessor.java |    86 -
 .../SecureQueryDecryptDescriptor.java           |    38 -
 .../SecureQueryDecryptProcessor.java            |   119 -
 .../SecureQueryDeploymentContributor.java       |   113 -
 .../SecureQueryEncodeDescriptor.java            |    38 -
 .../securequery/SecureQueryEncodeProcessor.java |    77 -
 .../SecureQueryEncryptDescriptor.java           |    38 -
 .../SecureQueryEncryptProcessor.java            |    84 -
 .../securequery/SecureQueryMessages.java        |    31 -
 .../SecureQueryDecodeDescriptor.java            |    38 +
 .../securequery/SecureQueryDecodeProcessor.java |    87 +
 .../SecureQueryDecryptDescriptor.java           |    38 +
 .../SecureQueryDecryptProcessor.java            |   120 +
 .../SecureQueryDeploymentContributor.java       |   113 +
 .../SecureQueryEncodeDescriptor.java            |    38 +
 .../securequery/SecureQueryEncodeProcessor.java |    77 +
 .../SecureQueryEncryptDescriptor.java           |    38 +
 .../SecureQueryEncryptProcessor.java            |    84 +
 .../securequery/SecureQueryMessages.java        |    31 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ....filter.rewrite.api.UrlRewriteStepDescriptor |    22 -
 ...y.filter.rewrite.spi.UrlRewriteStepProcessor |    22 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ....filter.rewrite.api.UrlRewriteStepDescriptor |    22 +
 ...y.filter.rewrite.spi.UrlRewriteStepProcessor |    22 +
 .../SecureQueryDecodeDescriptorTest.java        |    35 -
 .../SecureQueryDecodeProcessorTest.java         |   125 -
 .../SecureQueryDeploymentContributorTest.java   |   102 -
 .../SecureQueryEncodeDescriptorTest.java        |    35 -
 .../SecureQueryEncodeProcessorTest.java         |    75 -
 .../SecureQueryEncryptDecryptProcessorTest.java |   179 -
 .../SecureQueryDecodeDescriptorTest.java        |    35 +
 .../SecureQueryDecodeProcessorTest.java         |   125 +
 .../SecureQueryDeploymentContributorTest.java   |   100 +
 .../SecureQueryEncodeDescriptorTest.java        |    35 +
 .../SecureQueryEncodeProcessorTest.java         |    75 +
 .../SecureQueryEncryptDecryptProcessorTest.java |   179 +
 .../rewrite/api/CookieScopeServletFilter.java   |    48 -
 .../rewrite/api/FrontendFunctionDescriptor.java |    31 -
 .../rewrite/api/UrlRewriteEnvironment.java      |    31 -
 .../api/UrlRewriteFilterApplyDescriptor.java    |    27 -
 .../api/UrlRewriteFilterBufferDescriptor.java   |    25 -
 .../api/UrlRewriteFilterContentDescriptor.java  |    32 -
 .../rewrite/api/UrlRewriteFilterDescriptor.java |    37 -
 .../api/UrlRewriteFilterDetectDescriptor.java   |    33 -
 .../api/UrlRewriteFilterGroupDescriptor.java    |    30 -
 .../api/UrlRewriteFilterPathDescriptor.java     |    39 -
 .../api/UrlRewriteFilterScopeDescriptor.java    |    22 -
 .../rewrite/api/UrlRewriteFlowDescriptor.java   |    42 -
 .../api/UrlRewriteFunctionDescriptor.java       |    24 -
 .../UrlRewriteFunctionDescriptorFactory.java    |    61 -
 .../filter/rewrite/api/UrlRewriteProcessor.java |   182 -
 .../rewrite/api/UrlRewriteRuleDescriptor.java   |    52 -
 .../rewrite/api/UrlRewriteRulesDescriptor.java  |    57 -
 .../api/UrlRewriteRulesDescriptorFactory.java   |    77 -
 .../api/UrlRewriteServletContextListener.java   |   106 -
 .../api/UrlRewriteServletEnvironment.java       |    56 -
 .../rewrite/api/UrlRewriteServletFilter.java    |    63 -
 .../rewrite/api/UrlRewriteStepDescriptor.java   |    26 -
 .../api/UrlRewriteStepDescriptorFactory.java    |    60 -
 .../filter/rewrite/api/UrlRewriteStepFlow.java  |    20 -
 .../api/UrlRewriteStreamFilterFactory.java      |   115 -
 .../gateway/filter/rewrite/api/UrlRewriter.java |    31 -
 .../filter/rewrite/ext/ScopedMatcher.java       |   129 -
 .../rewrite/ext/UrlRewriteActionDescriptor.java |    32 -
 .../UrlRewriteActionRewriteDescriptorExt.java   |    52 -
 .../UrlRewriteActionRewriteProcessorExt.java    |    60 -
 .../rewrite/ext/UrlRewriteCheckDescriptor.java  |    36 -
 .../ext/UrlRewriteCheckDescriptorExt.java       |    99 -
 .../ext/UrlRewriteCheckProcessorExt.java        |    44 -
 .../ext/UrlRewriteControlDescriptor.java        |    23 -
 .../ext/UrlRewriteControlDescriptorExt.java     |    30 -
 .../ext/UrlRewriteControlProcessorExt.java      |    44 -
 .../rewrite/ext/UrlRewriteMatchDescriptor.java  |    39 -
 .../ext/UrlRewriteMatchDescriptorExt.java       |   110 -
 .../ext/UrlRewriteMatchProcessorExt.java        |    66 -
 .../filter/rewrite/i18n/UrlRewriteMessages.java |    87 -
 .../rewrite/i18n/UrlRewriteResources.java       |    41 -
 .../impl/CookieScopeResponseWrapper.java        |    59 -
 .../rewrite/impl/FrontendFunctionProcessor.java |   125 -
 .../rewrite/impl/UrlRewriteContextImpl.java     |   152 -
 .../impl/UrlRewriteDeploymentContributor.java   |   100 -
 .../UrlRewriteFilterApplyDescriptorImpl.java    |    47 -
 .../UrlRewriteFilterBufferDescriptorImpl.java   |    37 -
 .../UrlRewriteFilterContentDescriptorImpl.java  |    80 -
 .../impl/UrlRewriteFilterDescriptorImpl.java    |    87 -
 .../UrlRewriteFilterDetectDescriptorImpl.java   |    65 -
 .../UrlRewriteFilterGroupDescriptorBase.java    |    52 -
 .../rewrite/impl/UrlRewriteFilterReader.java    |    39 -
 .../UrlRewriteFilterScopeDescriptorImpl.java    |    25 -
 .../UrlRewriteFilterSelectorDescriptorBase.java |    64 -
 .../UrlRewriteFunctionProcessorFactory.java     |   113 -
 .../filter/rewrite/impl/UrlRewriteRequest.java  |   265 -
 .../rewrite/impl/UrlRewriteRequestStream.java   |    39 -
 .../filter/rewrite/impl/UrlRewriteResponse.java |   330 -
 .../rewrite/impl/UrlRewriteResponseStream.java  |    53 -
 .../impl/UrlRewriteRuleDescriptorImpl.java      |   194 -
 .../impl/UrlRewriteRuleProcessorHolder.java     |    65 -
 .../impl/UrlRewriteRuleProcessorImpl.java       |    58 -
 .../impl/UrlRewriteRulesDescriptorImpl.java     |   143 -
 .../impl/UrlRewriteStepProcessorFactory.java    |   106 -
 .../impl/UrlRewriteStepProcessorHolder.java     |   233 -
 .../impl/UrlRewriteStepProcessorState.java      |    88 -
 .../filter/rewrite/impl/UrlRewriteUtil.java     |    92 -
 .../rewrite/impl/form/FormFilterReader.java     |   105 -
 .../filter/rewrite/impl/form/FormPair.java      |    51 -
 .../filter/rewrite/impl/form/FormReader.java    |    96 -
 .../impl/form/FormUrlRewriteFilterReader.java   |    60 -
 .../impl/form/FormUrlRewriteStreamFilter.java   |    59 -
 .../filter/rewrite/impl/form/FormWriter.java    |    47 -
 .../rewrite/impl/html/HtmlFilterReader.java     |    61 -
 .../rewrite/impl/html/HtmlFilterReaderBase.java |   326 -
 .../impl/html/HtmlImportFunctionDescriptor.java |    30 -
 .../impl/html/HtmlImportFunctionProcessor.java  |    89 -
 .../rewrite/impl/html/HtmlPrefixDescriptor.java |    48 -
 .../rewrite/impl/html/HtmlPrefixProcessor.java  |   104 -
 .../impl/html/HtmlUrlRewriteFilterReader.java   |    74 -
 .../impl/html/HtmlUrlRewriteStreamFilter.java   |    64 -
 .../impl/javascript/JavaScriptFilterReader.java |    91 -
 .../JavaScriptUrlRewriteFilterReader.java       |    62 -
 .../JavaScriptUrlRewriteStreamFilter.java       |    64 -
 .../rewrite/impl/json/JsonFilterReader.java     |   644 -
 .../impl/json/JsonUrlRewriteFilterReader.java   |    64 -
 .../impl/json/JsonUrlRewriteStreamFilter.java   |    59 -
 .../impl/noop/NoOpUrlRewriteStreamFilter.java   |    55 -
 .../rewrite/impl/xml/XmlFilterReader.java       |   643 -
 .../impl/xml/XmlRewriteRulesDigester.java       |   239 -
 .../rewrite/impl/xml/XmlRewriteRulesTags.java   |    54 -
 .../impl/xml/XmlUrlRewriteFilterReader.java     |    82 -
 .../impl/xml/XmlUrlRewriteRulesExporter.java    |   188 -
 .../impl/xml/XmlUrlRewriteRulesImporter.java    |    52 -
 .../impl/xml/XmlUrlRewriteStreamFilter.java     |    67 -
 .../spi/UrlRewriteActionDescriptorBase.java     |    83 -
 .../filter/rewrite/spi/UrlRewriteContext.java   |    45 -
 .../spi/UrlRewriteFlowDescriptorBase.java       |   114 -
 .../spi/UrlRewriteFunctionProcessor.java        |    31 -
 .../spi/UrlRewriteFunctionProcessorBase.java    |    31 -
 .../filter/rewrite/spi/UrlRewriteResolver.java  |    26 -
 .../rewrite/spi/UrlRewriteRulesExporter.java    |    31 -
 .../rewrite/spi/UrlRewriteRulesImporter.java    |    31 -
 .../spi/UrlRewriteStepDescriptorBase.java       |    46 -
 .../rewrite/spi/UrlRewriteStepProcessor.java    |    33 -
 .../rewrite/spi/UrlRewriteStepStatus.java       |    20 -
 .../rewrite/spi/UrlRewriteStreamFilter.java     |    45 -
 .../rewrite/api/CookieScopeServletFilter.java   |    47 +
 .../rewrite/api/FrontendFunctionDescriptor.java |    31 +
 .../rewrite/api/UrlRewriteEnvironment.java      |    31 +
 .../api/UrlRewriteFilterApplyDescriptor.java    |    27 +
 .../api/UrlRewriteFilterBufferDescriptor.java   |    25 +
 .../api/UrlRewriteFilterContentDescriptor.java  |    32 +
 .../rewrite/api/UrlRewriteFilterDescriptor.java |    37 +
 .../api/UrlRewriteFilterDetectDescriptor.java   |    33 +
 .../api/UrlRewriteFilterGroupDescriptor.java    |    30 +
 .../api/UrlRewriteFilterPathDescriptor.java     |    39 +
 .../api/UrlRewriteFilterScopeDescriptor.java    |    22 +
 .../rewrite/api/UrlRewriteFlowDescriptor.java   |    42 +
 .../api/UrlRewriteFunctionDescriptor.java       |    24 +
 .../UrlRewriteFunctionDescriptorFactory.java    |    61 +
 .../filter/rewrite/api/UrlRewriteProcessor.java |   179 +
 .../rewrite/api/UrlRewriteRuleDescriptor.java   |    52 +
 .../rewrite/api/UrlRewriteRulesDescriptor.java  |    57 +
 .../api/UrlRewriteRulesDescriptorFactory.java   |    76 +
 .../api/UrlRewriteServletContextListener.java   |   106 +
 .../api/UrlRewriteServletEnvironment.java       |    56 +
 .../rewrite/api/UrlRewriteServletFilter.java    |    63 +
 .../rewrite/api/UrlRewriteStepDescriptor.java   |    26 +
 .../api/UrlRewriteStepDescriptorFactory.java    |    60 +
 .../filter/rewrite/api/UrlRewriteStepFlow.java  |    20 +
 .../api/UrlRewriteStreamFilterFactory.java      |   115 +
 .../gateway/filter/rewrite/api/UrlRewriter.java |    31 +
 .../filter/rewrite/ext/ScopedMatcher.java       |   129 +
 .../rewrite/ext/UrlRewriteActionDescriptor.java |    32 +
 .../UrlRewriteActionRewriteDescriptorExt.java   |    52 +
 .../UrlRewriteActionRewriteProcessorExt.java    |    60 +
 .../rewrite/ext/UrlRewriteCheckDescriptor.java  |    36 +
 .../ext/UrlRewriteCheckDescriptorExt.java       |    99 +
 .../ext/UrlRewriteCheckProcessorExt.java        |    45 +
 .../ext/UrlRewriteControlDescriptor.java        |    23 +
 .../ext/UrlRewriteControlDescriptorExt.java     |    30 +
 .../ext/UrlRewriteControlProcessorExt.java      |    45 +
 .../rewrite/ext/UrlRewriteMatchDescriptor.java  |    40 +
 .../ext/UrlRewriteMatchDescriptorExt.java       |   110 +
 .../ext/UrlRewriteMatchProcessorExt.java        |    67 +
 .../filter/rewrite/i18n/UrlRewriteMessages.java |    87 +
 .../rewrite/i18n/UrlRewriteResources.java       |    41 +
 .../impl/CookieScopeResponseWrapper.java        |    59 +
 .../rewrite/impl/FrontendFunctionProcessor.java |   125 +
 .../rewrite/impl/UrlRewriteContextImpl.java     |   152 +
 .../impl/UrlRewriteDeploymentContributor.java   |   101 +
 .../UrlRewriteFilterApplyDescriptorImpl.java    |    47 +
 .../UrlRewriteFilterBufferDescriptorImpl.java   |    36 +
 .../UrlRewriteFilterContentDescriptorImpl.java  |    80 +
 .../impl/UrlRewriteFilterDescriptorImpl.java    |    86 +
 .../UrlRewriteFilterDetectDescriptorImpl.java   |    65 +
 .../UrlRewriteFilterGroupDescriptorBase.java    |    52 +
 .../rewrite/impl/UrlRewriteFilterReader.java    |    39 +
 .../UrlRewriteFilterScopeDescriptorImpl.java    |    25 +
 .../UrlRewriteFilterSelectorDescriptorBase.java |    64 +
 .../UrlRewriteFunctionProcessorFactory.java     |   113 +
 .../filter/rewrite/impl/UrlRewriteRequest.java  |   265 +
 .../rewrite/impl/UrlRewriteRequestStream.java   |    40 +
 .../filter/rewrite/impl/UrlRewriteResponse.java |   331 +
 .../rewrite/impl/UrlRewriteResponseStream.java  |    54 +
 .../impl/UrlRewriteRuleDescriptorImpl.java      |   195 +
 .../impl/UrlRewriteRuleProcessorHolder.java     |    65 +
 .../impl/UrlRewriteRuleProcessorImpl.java       |    59 +
 .../impl/UrlRewriteRulesDescriptorImpl.java     |   143 +
 .../impl/UrlRewriteStepProcessorFactory.java    |   106 +
 .../impl/UrlRewriteStepProcessorHolder.java     |   233 +
 .../impl/UrlRewriteStepProcessorState.java      |    88 +
 .../filter/rewrite/impl/UrlRewriteUtil.java     |    92 +
 .../rewrite/impl/form/FormFilterReader.java     |   105 +
 .../filter/rewrite/impl/form/FormPair.java      |    51 +
 .../filter/rewrite/impl/form/FormReader.java    |    96 +
 .../impl/form/FormUrlRewriteFilterReader.java   |    60 +
 .../impl/form/FormUrlRewriteStreamFilter.java   |    59 +
 .../filter/rewrite/impl/form/FormWriter.java    |    47 +
 .../rewrite/impl/html/HtmlFilterReader.java     |    61 +
 .../rewrite/impl/html/HtmlFilterReaderBase.java |   327 +
 .../impl/html/HtmlImportFunctionDescriptor.java |    31 +
 .../impl/html/HtmlImportFunctionProcessor.java  |    90 +
 .../rewrite/impl/html/HtmlPrefixDescriptor.java |    48 +
 .../rewrite/impl/html/HtmlPrefixProcessor.java  |   104 +
 .../impl/html/HtmlUrlRewriteFilterReader.java   |    74 +
 .../impl/html/HtmlUrlRewriteStreamFilter.java   |    64 +
 .../impl/javascript/JavaScriptFilterReader.java |    91 +
 .../JavaScriptUrlRewriteFilterReader.java       |    62 +
 .../JavaScriptUrlRewriteStreamFilter.java       |    65 +
 .../rewrite/impl/json/JsonFilterReader.java     |   644 +
 .../impl/json/JsonUrlRewriteFilterReader.java   |    64 +
 .../impl/json/JsonUrlRewriteStreamFilter.java   |    59 +
 .../impl/noop/NoOpUrlRewriteStreamFilter.java   |    55 +
 .../rewrite/impl/xml/XmlFilterReader.java       |   643 +
 .../impl/xml/XmlRewriteRulesDigester.java       |   239 +
 .../rewrite/impl/xml/XmlRewriteRulesTags.java   |    54 +
 .../impl/xml/XmlUrlRewriteFilterReader.java     |    80 +
 .../impl/xml/XmlUrlRewriteRulesExporter.java    |   200 +
 .../impl/xml/XmlUrlRewriteRulesImporter.java    |    52 +
 .../impl/xml/XmlUrlRewriteStreamFilter.java     |    67 +
 .../spi/UrlRewriteActionDescriptorBase.java     |    83 +
 .../filter/rewrite/spi/UrlRewriteContext.java   |    45 +
 .../spi/UrlRewriteFlowDescriptorBase.java       |   115 +
 .../spi/UrlRewriteFunctionProcessor.java        |    31 +
 .../spi/UrlRewriteFunctionProcessorBase.java    |    31 +
 .../filter/rewrite/spi/UrlRewriteResolver.java  |    26 +
 .../rewrite/spi/UrlRewriteRulesExporter.java    |    31 +
 .../rewrite/spi/UrlRewriteRulesImporter.java    |    31 +
 .../spi/UrlRewriteStepDescriptorBase.java       |    46 +
 .../rewrite/spi/UrlRewriteStepProcessor.java    |    33 +
 .../rewrite/spi/UrlRewriteStepStatus.java       |    20 +
 .../rewrite/spi/UrlRewriteStreamFilter.java     |    43 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    21 -
 ....filter.rewrite.api.UrlRewriteStepDescriptor |    22 -
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    21 -
 ...y.filter.rewrite.spi.UrlRewriteStepProcessor |    23 -
 ...ay.filter.rewrite.spi.UrlRewriteStreamFilter |    24 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...ter.rewrite.api.UrlRewriteFunctionDescriptor |    21 +
 ....filter.rewrite.api.UrlRewriteStepDescriptor |    22 +
 ...lter.rewrite.spi.UrlRewriteFunctionProcessor |    21 +
 ...y.filter.rewrite.spi.UrlRewriteStepProcessor |    23 +
 ...ay.filter.rewrite.spi.UrlRewriteStreamFilter |    24 +
 .../api/FrontendFunctionDescriptorTest.java     |    52 -
 .../rewrite/api/UrlRewriteProcessorTest.java    |   412 -
 .../UrlRewriteRulesDescriptorFactoryTest.java   |   253 -
 .../UrlRewriteServletContextListenerTest.java   |    91 -
 .../api/UrlRewriteServletEnvironmentTest.java   |    60 -
 .../api/UrlRewriteServletFilterTest.java        |   921 --
 .../impl/CookieScopeResponseWrapperTest.java    |    91 -
 .../impl/FrontendFunctionProcessorTest.java     |   303 -
 .../rewrite/impl/UrlRewriteContextImplTest.java |    71 -
 .../rewrite/impl/UrlRewriteResponseTest.java    |   171 -
 .../impl/UrlRewriteStepProcessorStateTest.java  |   251 -
 .../gateway/filter/rewrite/impl/gateway.xml     |    33 -
 .../impl/html/HtmlFilterReaderBaseTest.java     |   765 --
 .../html/HtmlImportFunctionProcessorTest.java   |    52 -
 .../impl/html/HtmlPrefixProcessorTest.java      |    57 -
 .../javascript/JavaScriptFilterReaderTest.java  |   118 -
 .../rewrite/impl/json/JsonFilterReaderTest.java |   364 -
 .../rewrite/impl/json/NoopJsonFilterReader.java |    39 -
 .../rewrite/impl/json/TestJsonFilterReader.java |    39 -
 .../gateway/filter/rewrite/impl/rewrite.xml     |   106 -
 .../rewrite/impl/xml/XmlFilterReaderTest.java   |  1003 --
 .../xml/XmlUrlRewriteRulesExporterTest.java     |   215 -
 .../api/FrontendFunctionDescriptorTest.java     |    52 +
 .../rewrite/api/UrlRewriteProcessorTest.java    |   412 +
 .../UrlRewriteRulesDescriptorFactoryTest.java   |   253 +
 .../UrlRewriteServletContextListenerTest.java   |    89 +
 .../api/UrlRewriteServletEnvironmentTest.java   |    60 +
 .../api/UrlRewriteServletFilterTest.java        |   920 ++
 .../impl/CookieScopeResponseWrapperTest.java    |    91 +
 .../impl/FrontendFunctionProcessorTest.java     |   303 +
 .../rewrite/impl/UrlRewriteContextImplTest.java |    71 +
 .../rewrite/impl/UrlRewriteResponseTest.java    |   171 +
 .../impl/UrlRewriteStepProcessorStateTest.java  |   255 +
 .../gateway/filter/rewrite/impl/gateway.xml     |    33 +
 .../impl/html/HtmlFilterReaderBaseTest.java     |   765 ++
 .../html/HtmlImportFunctionProcessorTest.java   |    52 +
 .../impl/html/HtmlPrefixProcessorTest.java      |    57 +
 .../javascript/JavaScriptFilterReaderTest.java  |   118 +
 .../rewrite/impl/json/JsonFilterReaderTest.java |   363 +
 .../rewrite/impl/json/NoopJsonFilterReader.java |    39 +
 .../rewrite/impl/json/TestJsonFilterReader.java |    39 +
 .../gateway/filter/rewrite/impl/rewrite.xml     |   106 +
 .../rewrite/impl/xml/XmlFilterReaderTest.java   |  1003 ++
 .../xml/XmlUrlRewriteRulesExporterTest.java     |   215 +
 .../rewrite-with-same-rules-different-scope.xml |    54 -
 .../rewrite-with-same-rules.xml                 |    39 -
 .../api/UrlRewriteProcessorTest/rewrite.xml     |    36 -
 .../empty.xml                                   |    16 -
 .../filter-complete.xml                         |    33 -
 .../filter-sample.xml                           |    37 -
 .../filter-simple.xml                           |    24 -
 .../invalid.xml                                 |    18 -
 .../noop.xml                                    |    18 -
 .../simple.xml                                  |    19 -
 .../rewrite.xml                                 |    18 -
 .../api/UrlRewriteServletFilterTest/rewrite.xml |   109 -
 .../FrontendFunctionProcessorTest/rewrite.xml   |    64 -
 .../test-input-body.json                        |    10 -
 .../impl/json/JsonFilterReaderTest/array.json   |     4 -
 .../impl/json/JsonFilterReaderTest/complex.json |    16 -
 .../JsonFilterReaderTest/dotted-field-name.json |     6 -
 .../JsonFilterReaderTest/empty-array-value.json |     3 -
 .../empty-object-value.json                     |     3 -
 .../json/JsonFilterReaderTest/properties.json   |    19 -
 .../JsonFilterReaderTest/simple-values.json     |     7 -
 .../properties-attributes.xml                   |    22 -
 .../XmlFilterReaderTest/properties-elements.xml |    31 -
 .../rewrite-with-same-rules-different-scope.xml |    54 +
 .../rewrite-with-same-rules.xml                 |    39 +
 .../api/UrlRewriteProcessorTest/rewrite.xml     |    36 +
 .../empty.xml                                   |    16 +
 .../filter-complete.xml                         |    33 +
 .../filter-sample.xml                           |    37 +
 .../filter-simple.xml                           |    24 +
 .../invalid.xml                                 |    18 +
 .../noop.xml                                    |    18 +
 .../simple.xml                                  |    19 +
 .../rewrite.xml                                 |    18 +
 .../api/UrlRewriteServletFilterTest/rewrite.xml |   109 +
 .../FrontendFunctionProcessorTest/rewrite.xml   |    64 +
 .../test-input-body.json                        |    10 +
 .../impl/json/JsonFilterReaderTest/array.json   |     4 +
 .../impl/json/JsonFilterReaderTest/complex.json |    16 +
 .../JsonFilterReaderTest/dotted-field-name.json |     6 +
 .../JsonFilterReaderTest/empty-array-value.json |     3 +
 .../empty-object-value.json                     |     3 +
 .../json/JsonFilterReaderTest/properties.json   |    19 +
 .../JsonFilterReaderTest/simple-values.json     |     7 +
 .../properties-attributes.xml                   |    22 +
 .../XmlFilterReaderTest/properties-elements.xml |    31 +
 .../AnonymousAuthDeploymentContributor.java     |    65 -
 .../gateway/filter/AnonymousAuthFilter.java     |   101 -
 .../AnonymousAuthDeploymentContributor.java     |    65 +
 .../gateway/filter/AnonymousAuthFilter.java     |   101 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../AnonymousAuthDeploymentContributorTest.java |    44 -
 .../AnonymousAuthDeploymentContributorTest.java |    44 +
 .../impl/AclsAuthzDeploymentContributor.java    |    75 -
 .../apache/hadoop/gateway/filter/AclParser.java |    85 -
 .../gateway/filter/AclsAuthorizationFilter.java |   216 -
 .../filter/AclsAuthorizationMessages.java       |    66 -
 .../filter/AclsAuthorizationResources.java      |    27 -
 .../gateway/filter/InvalidACLException.java     |    31 -
 .../impl/AclsAuthzDeploymentContributor.java    |    73 +
 .../apache/knox/gateway/filter/AclParser.java   |    85 +
 .../gateway/filter/AclsAuthorizationFilter.java |   212 +
 .../filter/AclsAuthorizationMessages.java       |    65 +
 .../filter/AclsAuthorizationResources.java      |    27 +
 .../gateway/filter/InvalidACLException.java     |    31 +
 ...gateway.deploy.ProviderDeploymentContributor |    18 -
 ...gateway.deploy.ProviderDeploymentContributor |    18 +
 .../hadoop/gateway/filter/AclParserTest.java    |   212 -
 .../knox/gateway/filter/AclParserTest.java      |   212 +
 .../gateway/hadoopauth/HadoopAuthMessages.java  |    33 -
 .../deploy/HadoopAuthDeploymentContributor.java |    70 -
 .../hadoopauth/filter/HadoopAuthFilter.java     |    68 -
 .../hadoopauth/filter/HadoopAuthPostFilter.java |   108 -
 .../gateway/hadoopauth/HadoopAuthMessages.java  |    33 +
 .../deploy/HadoopAuthDeploymentContributor.java |    70 +
 .../hadoopauth/filter/HadoopAuthFilter.java     |    68 +
 .../hadoopauth/filter/HadoopAuthPostFilter.java |   108 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../provider/federation/jwt/JWTMessages.java    |    57 -
 .../AccessTokenFederationContributor.java       |    51 -
 .../JWTAccessTokenAssertionContributor.java     |    63 -
 .../deploy/JWTAuthCodeAssertionContributor.java |    51 -
 .../jwt/deploy/JWTFederationContributor.java    |    62 -
 .../deploy/SSOCookieFederationContributor.java  |    62 -
 .../jwt/filter/AbstractJWTFilter.java           |   263 -
 .../jwt/filter/AccessTokenFederationFilter.java |   163 -
 .../filter/JWTAccessTokenAssertionFilter.java   |   164 -
 .../jwt/filter/JWTAuthCodeAssertionFilter.java  |   100 -
 .../jwt/filter/JWTFederationFilter.java         |   109 -
 .../jwt/filter/SSOCookieFederationFilter.java   |   168 -
 .../provider/federation/jwt/JWTMessages.java    |    57 +
 .../AccessTokenFederationContributor.java       |    51 +
 .../JWTAccessTokenAssertionContributor.java     |    63 +
 .../deploy/JWTAuthCodeAssertionContributor.java |    51 +
 .../jwt/deploy/JWTFederationContributor.java    |    63 +
 .../deploy/SSOCookieFederationContributor.java  |    63 +
 .../jwt/filter/AbstractJWTFilter.java           |   263 +
 .../jwt/filter/AccessTokenFederationFilter.java |   163 +
 .../filter/JWTAccessTokenAssertionFilter.java   |   164 +
 .../jwt/filter/JWTAuthCodeAssertionFilter.java  |   100 +
 .../jwt/filter/JWTFederationFilter.java         |   109 +
 .../jwt/filter/SSOCookieFederationFilter.java   |   168 +
 ...gateway.deploy.ProviderDeploymentContributor |    23 -
 ...gateway.deploy.ProviderDeploymentContributor |    23 +
 .../federation/AbstractJWTFilterTest.java       |   490 -
 .../federation/JWTFederationFilterTest.java     |    67 -
 .../provider/federation/JWTTokenTest.java       |   133 -
 .../federation/SSOCookieProviderTest.java       |   205 -
 .../federation/AbstractJWTFilterTest.java       |   490 +
 .../federation/JWTFederationFilterTest.java     |    67 +
 .../provider/federation/JWTTokenTest.java       |   133 +
 .../federation/SSOCookieProviderTest.java       |   205 +
 .../hadoop/gateway/pac4j/Pac4jMessages.java     |    50 -
 .../Pac4jFederationProviderContributor.java     |    77 -
 .../pac4j/filter/Pac4jDispatcherFilter.java     |   215 -
 .../pac4j/filter/Pac4jIdentityAdapter.java      |   132 -
 .../gateway/pac4j/session/KnoxSessionStore.java |   120 -
 .../knox/gateway/pac4j/Pac4jMessages.java       |    50 +
 .../Pac4jFederationProviderContributor.java     |    78 +
 .../pac4j/filter/Pac4jDispatcherFilter.java     |   215 +
 .../pac4j/filter/Pac4jIdentityAdapter.java      |   138 +
 .../gateway/pac4j/session/KnoxSessionStore.java |   120 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../gateway/pac4j/MockHttpServletRequest.java   |    88 -
 .../gateway/pac4j/MockHttpServletResponse.java  |    82 -
 .../hadoop/gateway/pac4j/Pac4jProviderTest.java |   150 -
 .../gateway/pac4j/MockHttpServletRequest.java   |    88 +
 .../gateway/pac4j/MockHttpServletResponse.java  |    82 +
 .../knox/gateway/pac4j/Pac4jProviderTest.java   |   150 +
 .../gateway/picketlink/PicketlinkMessages.java  |    40 -
 .../picketlink/deploy/PicketlinkConf.java       |   194 -
 ...PicketlinkFederationProviderContributor.java |   132 -
 .../filter/CaptureOriginalURLFilter.java        |    89 -
 .../filter/PicketlinkIdentityAdapter.java       |   102 -
 .../gateway/picketlink/PicketlinkMessages.java  |    40 +
 .../picketlink/deploy/PicketlinkConf.java       |   194 +
 ...PicketlinkFederationProviderContributor.java |   132 +
 .../filter/CaptureOriginalURLFilter.java        |    89 +
 .../filter/PicketlinkIdentityAdapter.java       |   102 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../gateway/picketlink/PicketlinkTest.java      |    31 -
 .../knox/gateway/picketlink/PicketlinkTest.java |    30 +
 .../hadoop/gateway/preauth/PreAuthMessages.java |    26 -
 .../deploy/HeaderPreAuthContributor.java        |    66 -
 .../filter/AbstractPreAuthFederationFilter.java |   144 -
 .../preauth/filter/DefaultValidator.java        |    56 -
 .../filter/HeaderPreAuthFederationFilter.java   |    72 -
 .../gateway/preauth/filter/IPValidator.java     |    58 -
 .../preauth/filter/PreAuthFederationFilter.java |   142 -
 .../gateway/preauth/filter/PreAuthService.java  |   106 -
 .../filter/PreAuthValidationException.java      |    32 -
 .../preauth/filter/PreAuthValidator.java        |    42 -
 .../knox/gateway/preauth/PreAuthMessages.java   |    24 +
 .../deploy/HeaderPreAuthContributor.java        |    66 +
 .../filter/AbstractPreAuthFederationFilter.java |   144 +
 .../preauth/filter/DefaultValidator.java        |    56 +
 .../filter/HeaderPreAuthFederationFilter.java   |    71 +
 .../gateway/preauth/filter/IPValidator.java     |    58 +
 .../preauth/filter/PreAuthFederationFilter.java |   142 +
 .../gateway/preauth/filter/PreAuthService.java  |   106 +
 .../filter/PreAuthValidationException.java      |    32 +
 .../preauth/filter/PreAuthValidator.java        |    42 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...doop.gateway.preauth.filter.PreAuthValidator |    20 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ...knox.gateway.preauth.filter.PreAuthValidator |    20 +
 .../federation/DefaultValidatorTest.java        |    43 -
 .../HeaderPreAuthFederationFilterTest.java      |   140 -
 .../provider/federation/IPValidatorTest.java    |    61 -
 .../provider/federation/PreAuthSSOTest.java     |    31 -
 .../provider/federation/PreAuthServiceTest.java |   109 -
 .../federation/DefaultValidatorTest.java        |    43 +
 .../HeaderPreAuthFederationFilterTest.java      |   147 +
 .../provider/federation/IPValidatorTest.java    |    61 +
 .../provider/federation/PreAuthSSOTest.java     |    30 +
 .../provider/federation/PreAuthServiceTest.java |   115 +
 ...doop.gateway.preauth.filter.PreAuthValidator |    19 -
 ...knox.gateway.preauth.filter.PreAuthValidator |    19 +
 .../hadoop/gateway/deploy/impl/ShiroConfig.java |    71 -
 .../deploy/impl/ShiroDeploymentContributor.java |   140 -
 .../gateway/filter/RedirectToUrlFilter.java     |    52 -
 .../gateway/filter/ResponseCookieFilter.java    |    88 -
 .../filter/ShiroSubjectIdentityAdapter.java     |   150 -
 .../gateway/shirorealm/KnoxCacheManager.java    |    27 -
 .../shirorealm/KnoxLdapContextFactory.java      |   128 -
 .../gateway/shirorealm/KnoxLdapRealm.java       |   768 --
 .../hadoop/gateway/shirorealm/KnoxPamRealm.java |   163 -
 .../gateway/shirorealm/UnixUserPrincipal.java   |    46 -
 .../shirorealm/impl/i18n/KnoxShiroMessages.java |    44 -
 .../knox/gateway/deploy/impl/ShiroConfig.java   |    71 +
 .../deploy/impl/ShiroDeploymentContributor.java |   140 +
 .../gateway/filter/RedirectToUrlFilter.java     |    52 +
 .../gateway/filter/ResponseCookieFilter.java    |    88 +
 .../filter/ShiroSubjectIdentityAdapter.java     |   150 +
 .../gateway/shirorealm/KnoxCacheManager.java    |    27 +
 .../shirorealm/KnoxLdapContextFactory.java      |   125 +
 .../knox/gateway/shirorealm/KnoxLdapRealm.java  |   768 ++
 .../knox/gateway/shirorealm/KnoxPamRealm.java   |   163 +
 .../gateway/shirorealm/UnixUserPrincipal.java   |    46 +
 .../shirorealm/impl/i18n/KnoxShiroMessages.java |    44 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../impl/ShiroDeploymentContributorTest.java    |   108 -
 .../gateway/shirorealm/KnoxLdapRealmTest.java   |   104 -
 .../gateway/shirorealm/KnoxPamRealmTest.java    |    70 -
 .../impl/ShiroDeploymentContributorTest.java    |   104 +
 .../gateway/shirorealm/KnoxLdapRealmTest.java   |   104 +
 .../gateway/shirorealm/KnoxPamRealmTest.java    |    68 +
 .../gateway/webappsec/WebAppSecMessages.java    |    26 -
 .../webappsec/deploy/WebAppSecContributor.java  |   106 -
 .../webappsec/filter/CSRFPreventionFilter.java  |    76 -
 .../webappsec/filter/XFrameOptionsFilter.java   |   137 -
 .../gateway/webappsec/WebAppSecMessages.java    |    24 +
 .../webappsec/deploy/WebAppSecContributor.java  |   106 +
 .../webappsec/filter/CSRFPreventionFilter.java  |    76 +
 .../webappsec/filter/XFrameOptionsFilter.java   |   137 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 .../hadoop/gateway/webappsec/CSRFTest.java      |    29 -
 .../webappsec/XFrameOptionsFilterTest.java      |   193 -
 .../apache/knox/gateway/webappsec/CSRFTest.java |    29 +
 .../webappsec/XFrameOptionsFilterTest.java      |   193 +
 .../home/conf/gateway-log4j.properties          |     2 +-
 gateway-release/home/conf/topologies/admin.xml  |     4 +-
 .../home/conf/topologies/knoxsso.xml            |     4 +-
 .../home/conf/topologies/manager.xml            |     4 +-
 .../home/conf/topologies/sandbox.xml            |     4 +-
 gateway-release/home/templates/ad.xml           |     4 +-
 gateway-release/home/templates/dynamicgroup.xml |     4 +-
 .../home/templates/hs2-grouplookup-cache.xml    |     4 +-
 gateway-release/home/templates/sample.xml       |     4 +-
 gateway-release/home/templates/sandbox-1-3.xml  |     4 +-
 .../templates/sandbox.knoxrealm.ehcache.xml     |     6 +-
 .../home/templates/sandbox.knoxrealm.xml        |     4 +-
 .../home/templates/sandbox.knoxrealm1.xml       |     4 +-
 .../home/templates/sandbox.knoxrealm2.xml       |     8 +-
 .../home/templates/sandbox.knoxrealmdg.xml      |     4 +-
 gateway-release/home/templates/staticgroup.xml  |     4 +-
 gateway-release/home/templates/ui.xml           |     4 +-
 ...ache.hadoop.gateway.services.GatewayServices |    20 -
 ...apache.knox.gateway.services.GatewayServices |    20 +
 gateway-server-launcher/pom.xml                 |     2 +-
 .../gateway/filter/CompositeEnumeration.java    |    56 -
 .../gateway/filter/XForwardedHeaderFilter.java  |    32 -
 .../filter/XForwardedHeaderRequestWrapper.java  |   150 -
 .../gateway/filter/CompositeEnumeration.java    |    56 +
 .../gateway/filter/XForwardedHeaderFilter.java  |    32 +
 .../filter/XForwardedHeaderRequestWrapper.java  |   150 +
 .../filter/CompositeEnumerationTest.java        |   117 -
 .../gateway/filter/TestFilterAdapter.java       |    45 -
 .../hadoop/gateway/filter/TestFilterChain.java  |    35 -
 .../filter/XForwardHeaderFilterTest.java        |   108 -
 .../filter/CompositeEnumerationTest.java        |   117 +
 .../knox/gateway/filter/TestFilterAdapter.java  |    45 +
 .../knox/gateway/filter/TestFilterChain.java    |    35 +
 .../filter/XForwardHeaderFilterTest.java        |   108 +
 .../hadoop/gateway/GatewayCommandLine.java      |    86 -
 .../apache/hadoop/gateway/GatewayFactory.java   |   100 -
 .../apache/hadoop/gateway/GatewayFilter.java    |   390 -
 .../gateway/GatewayForwardingServlet.java       |   141 -
 .../apache/hadoop/gateway/GatewayMessages.java  |   516 -
 .../apache/hadoop/gateway/GatewayResources.java |    88 -
 .../apache/hadoop/gateway/GatewayServer.java    |  1029 --
 .../apache/hadoop/gateway/GatewayServlet.java   |   302 -
 .../gateway/config/impl/GatewayConfigImpl.java  |   915 --
 .../gateway/deploy/DeploymentContextImpl.java   |   140 -
 .../gateway/deploy/DeploymentException.java     |    31 -
 .../gateway/deploy/DeploymentFactory.java       |   770 --
 .../impl/ApplicationDeploymentContributor.java  |   227 -
 .../impl/DispatchDeploymentContributor.java     |    59 -
 .../GenericProviderDeploymentContributor.java   |    93 -
 .../ServiceDefinitionDeploymentContributor.java |   256 -
 .../descriptor/GatewayDescriptorFactory.java    |    67 -
 .../descriptor/impl/FilterDescriptorImpl.java   |   120 -
 .../impl/FilterParamDescriptorImpl.java         |    69 -
 .../descriptor/impl/GatewayDescriptorImpl.java  |    92 -
 .../impl/GatewayParamDescriptorImpl.java        |    64 -
 .../descriptor/impl/ResourceDescriptorImpl.java |   131 -
 .../impl/ResourceParamDescriptorImpl.java       |    65 -
 .../xml/XmlGatewayDescriptorExporter.java       |   114 -
 .../xml/XmlGatewayDescriptorFactory.java        |    30 -
 .../xml/XmlGatewayDescriptorImporter.java       |    52 -
 .../xml/XmlGatewayDescriptorRules.java          |    68 -
 .../xml/XmlGatewayDescriptorTags.java           |    34 -
 .../gateway/dispatch/DispatchParamResolver.java |    68 -
 .../gateway/dispatch/ServletDispatch.java       |    54 -
 .../gateway/dispatch/UrlConnectionDispatch.java |   163 -
 .../filter/BasicAuthChallengeFilter.java        |    84 -
 .../gateway/filter/CorrelationHandler.java      |    45 -
 .../hadoop/gateway/filter/JaasLoginFilter.java  |    86 -
 .../filter/PortMappingHelperHandler.java        |   156 -
 .../gateway/filter/RequestUpdateHandler.java    |   136 -
 .../hadoop/gateway/filter/SessionFilter.java    |    38 -
 .../gateway/services/CLIGatewayServices.java    |   143 -
 .../services/DefaultGatewayServices.java        |   224 -
 .../services/DefaultServerInfoService.java      |    69 -
 .../GatewayMetricsServletContextListener.java   |    31 -
 .../GatewayServicesContextListener.java         |    54 -
 .../hostmap/impl/DefaultHostMapperService.java  |    81 -
 .../metrics/impl/DefaultMetricsContext.java     |    49 -
 .../metrics/impl/DefaultMetricsService.java     |   152 -
 .../impl/instr/InstrGatewayFilterProvider.java  |    37 -
 .../InstrGatewayFilterProviderDescriptor.java   |    40 -
 .../instr/InstrHttpClientBuilderProvider.java   |    70 -
 .../InstrHttpClientProviderDescriptor.java      |    40 -
 .../impl/instr/InstrumentedGatewayFilter.java   |    99 -
 .../impl/reporters/AbstractMetricsReporter.java |    33 -
 .../impl/reporters/GraphiteMetricsReporter.java |    69 -
 .../impl/reporters/JmxMetricsReporter.java      |    56 -
 .../registry/impl/DefaultServiceDefEntry.java   |    52 -
 .../impl/DefaultServiceDefinitionRegistry.java  |    95 -
 .../impl/DefaultServiceRegistryService.java     |   207 -
 .../services/registry/impl/RegEntry.java        |    59 -
 .../services/registry/impl/Registry.java        |    33 -
 .../security/impl/CLIMasterService.java         |    55 -
 .../security/impl/DefaultAliasService.java      |   217 -
 .../security/impl/DefaultCryptoService.java     |   206 -
 .../security/impl/DefaultKeystoreService.java   |   340 -
 .../security/impl/DefaultMasterService.java     |    58 -
 .../services/security/impl/JettySSLService.java |   255 -
 .../impl/DefaultTokenAuthorityService.java      |   225 -
 .../topology/impl/DefaultTopologyService.java   |   447 -
 .../builder/BeanPropertyTopologyBuilder.java    |    94 -
 .../builder/PropertyTopologyBuilder.java        |    64 -
 .../topology/builder/property/Property.java     |    47 -
 .../interpreter/AbstractInterpreter.java        |    22 -
 .../interpreter/GatewayPropertyInterpreter.java |    54 -
 .../interpreter/InterpretException.java         |    36 -
 .../property/interpreter/Interpreter.java       |    22 -
 .../interpreter/PropertyInterpreter.java        |    54 -
 .../ProviderParameterPropertyInterpreter.java   |    50 -
 .../ProviderPropertyInterpreter.java            |    88 -
 .../ServiceParameterPropertyInterpreter.java    |    50 -
 .../interpreter/ServicePropertyInterpreter.java |    89 -
 .../TopologyPropertyInterpreter.java            |    62 -
 .../topology/validation/TopologyValidator.java  |   122 -
 .../xml/AmbariFormatXmlTopologyRules.java       |    37 -
 .../xml/KnoxFormatXmlTopologyRules.java         |    93 -
 .../hadoop/gateway/trace/AccessHandler.java     |    53 -
 .../hadoop/gateway/trace/ErrorHandler.java      |    42 -
 .../hadoop/gateway/trace/TraceHandler.java      |    54 -
 .../apache/hadoop/gateway/trace/TraceInput.java |    71 -
 .../hadoop/gateway/trace/TraceOutput.java       |    76 -
 .../hadoop/gateway/trace/TraceRequest.java      |    83 -
 .../hadoop/gateway/trace/TraceResponse.java     |    77 -
 .../apache/hadoop/gateway/trace/TraceUtil.java  |    72 -
 .../gateway/util/CredentialsProvider.java       |    50 -
 .../org/apache/hadoop/gateway/util/KnoxCLI.java |  1779 ---
 .../gateway/util/PrincipalCredentials.java      |    83 -
 .../gateway/util/ServiceDefinitionsLoader.java  |   138 -
 .../websockets/GatewayWebsocketHandler.java     |   241 -
 .../websockets/MessageEventCallback.java        |    66 -
 .../gateway/websockets/ProxyInboundSocket.java  |    80 -
 .../websockets/ProxyWebSocketAdapter.java       |   277 -
 .../websockets/WebsocketLogMessages.java        |    60 -
 .../apache/knox/gateway/GatewayCommandLine.java |    86 +
 .../org/apache/knox/gateway/GatewayFactory.java |   100 +
 .../org/apache/knox/gateway/GatewayFilter.java  |   390 +
 .../knox/gateway/GatewayForwardingServlet.java  |   145 +
 .../apache/knox/gateway/GatewayMessages.java    |   516 +
 .../apache/knox/gateway/GatewayResources.java   |    88 +
 .../org/apache/knox/gateway/GatewayServer.java  |  1029 ++
 .../org/apache/knox/gateway/GatewayServlet.java |   302 +
 .../gateway/config/impl/GatewayConfigImpl.java  |   915 ++
 .../gateway/deploy/DeploymentContextImpl.java   |   140 +
 .../gateway/deploy/DeploymentException.java     |    31 +
 .../knox/gateway/deploy/DeploymentFactory.java  |   772 ++
 .../impl/ApplicationDeploymentContributor.java  |   228 +
 .../impl/DispatchDeploymentContributor.java     |    60 +
 .../GenericProviderDeploymentContributor.java   |    94 +
 .../ServiceDefinitionDeploymentContributor.java |   256 +
 .../descriptor/GatewayDescriptorFactory.java    |    67 +
 .../descriptor/impl/FilterDescriptorImpl.java   |   120 +
 .../impl/FilterParamDescriptorImpl.java         |    69 +
 .../descriptor/impl/GatewayDescriptorImpl.java  |    92 +
 .../impl/GatewayParamDescriptorImpl.java        |    64 +
 .../descriptor/impl/ResourceDescriptorImpl.java |   131 +
 .../impl/ResourceParamDescriptorImpl.java       |    65 +
 .../xml/XmlGatewayDescriptorExporter.java       |   114 +
 .../xml/XmlGatewayDescriptorFactory.java        |    30 +
 .../xml/XmlGatewayDescriptorImporter.java       |    52 +
 .../xml/XmlGatewayDescriptorRules.java          |    68 +
 .../xml/XmlGatewayDescriptorTags.java           |    34 +
 .../gateway/dispatch/DispatchParamResolver.java |    68 +
 .../knox/gateway/dispatch/ServletDispatch.java  |    54 +
 .../gateway/dispatch/UrlConnectionDispatch.java |   163 +
 .../filter/BasicAuthChallengeFilter.java        |    84 +
 .../knox/gateway/filter/CorrelationHandler.java |    45 +
 .../knox/gateway/filter/JaasLoginFilter.java    |    86 +
 .../filter/PortMappingHelperHandler.java        |   156 +
 .../gateway/filter/RequestUpdateHandler.java    |   136 +
 .../knox/gateway/filter/SessionFilter.java      |    38 +
 .../gateway/services/CLIGatewayServices.java    |   143 +
 .../services/DefaultGatewayServices.java        |   224 +
 .../services/DefaultServerInfoService.java      |    69 +
 .../GatewayMetricsServletContextListener.java   |    31 +
 .../GatewayServicesContextListener.java         |    54 +
 .../hostmap/impl/DefaultHostMapperService.java  |    81 +
 .../metrics/impl/DefaultMetricsContext.java     |    49 +
 .../metrics/impl/DefaultMetricsService.java     |   153 +
 .../impl/instr/InstrGatewayFilterProvider.java  |    38 +
 .../InstrGatewayFilterProviderDescriptor.java   |    40 +
 .../instr/InstrHttpClientBuilderProvider.java   |    70 +
 .../InstrHttpClientProviderDescriptor.java      |    41 +
 .../impl/instr/InstrumentedGatewayFilter.java   |    99 +
 .../impl/reporters/AbstractMetricsReporter.java |    33 +
 .../impl/reporters/GraphiteMetricsReporter.java |    70 +
 .../impl/reporters/JmxMetricsReporter.java      |    57 +
 .../registry/impl/DefaultServiceDefEntry.java   |    52 +
 .../impl/DefaultServiceDefinitionRegistry.java  |    96 +
 .../impl/DefaultServiceRegistryService.java     |   207 +
 .../services/registry/impl/RegEntry.java        |    59 +
 .../services/registry/impl/Registry.java        |    33 +
 .../security/impl/CLIMasterService.java         |    56 +
 .../security/impl/DefaultAliasService.java      |   217 +
 .../security/impl/DefaultCryptoService.java     |   206 +
 .../security/impl/DefaultKeystoreService.java   |   340 +
 .../security/impl/DefaultMasterService.java     |    59 +
 .../services/security/impl/JettySSLService.java |   255 +
 .../impl/DefaultTokenAuthorityService.java      |   225 +
 .../topology/impl/DefaultTopologyService.java   |   448 +
 .../builder/BeanPropertyTopologyBuilder.java    |    94 +
 .../builder/PropertyTopologyBuilder.java        |    64 +
 .../topology/builder/property/Property.java     |    47 +
 .../interpreter/AbstractInterpreter.java        |    22 +
 .../interpreter/GatewayPropertyInterpreter.java |    54 +
 .../interpreter/InterpretException.java         |    36 +
 .../property/interpreter/Interpreter.java       |    22 +
 .../interpreter/PropertyInterpreter.java        |    54 +
 .../ProviderParameterPropertyInterpreter.java   |    50 +
 .../ProviderPropertyInterpreter.java            |    88 +
 .../ServiceParameterPropertyInterpreter.java    |    50 +
 .../interpreter/ServicePropertyInterpreter.java |    89 +
 .../TopologyPropertyInterpreter.java            |    62 +
 .../topology/validation/TopologyValidator.java  |   122 +
 .../xml/AmbariFormatXmlTopologyRules.java       |    37 +
 .../xml/KnoxFormatXmlTopologyRules.java         |    93 +
 .../knox/gateway/trace/AccessHandler.java       |    53 +
 .../apache/knox/gateway/trace/ErrorHandler.java |    42 +
 .../apache/knox/gateway/trace/TraceHandler.java |    54 +
 .../apache/knox/gateway/trace/TraceInput.java   |    71 +
 .../apache/knox/gateway/trace/TraceOutput.java  |    76 +
 .../apache/knox/gateway/trace/TraceRequest.java |    83 +
 .../knox/gateway/trace/TraceResponse.java       |    77 +
 .../apache/knox/gateway/trace/TraceUtil.java    |    72 +
 .../knox/gateway/util/CredentialsProvider.java  |    50 +
 .../org/apache/knox/gateway/util/KnoxCLI.java   |  1777 +++
 .../knox/gateway/util/PrincipalCredentials.java |    81 +
 .../gateway/util/ServiceDefinitionsLoader.java  |   138 +
 .../websockets/GatewayWebsocketHandler.java     |   241 +
 .../websockets/MessageEventCallback.java        |    66 +
 .../gateway/websockets/ProxyInboundSocket.java  |    80 +
 .../websockets/ProxyWebSocketAdapter.java       |   276 +
 .../websockets/WebsocketLogMessages.java        |    60 +
 ...gateway.deploy.ProviderDeploymentContributor |    20 -
 ....gateway.deploy.ServiceDeploymentContributor |    17 -
 ...es.metrics.InstrumentationProviderDescriptor |    20 -
 ...oop.gateway.services.metrics.MetricsReporter |    20 -
 ...gateway.deploy.ProviderDeploymentContributor |    20 +
 ....gateway.deploy.ServiceDeploymentContributor |    17 +
 ...es.metrics.InstrumentationProviderDescriptor |    20 +
 ...nox.gateway.services.metrics.MetricsReporter |    20 +
 .../org/apache/hadoop/gateway/GatewayServer.xml |    67 -
 .../org/apache/knox/gateway/GatewayServer.xml   |    67 +
 .../apache/hadoop/gateway/AuditLoggingTest.java |   255 -
 .../hadoop/gateway/GatewayFilterTest.java       |   171 -
 .../gateway/GatewayForwardingServletTest.java   |    66 -
 .../apache/hadoop/gateway/GatewayFuncTest.xml   |    67 -
 .../hadoop/gateway/GatewayGlobalConfigTest.java |   214 -
 .../gateway/GatewayPortMappingConfigTest.java   |   204 -
 .../apache/hadoop/gateway/TempletonDemo.java    |    70 -
 .../config/impl/GatewayConfigImplTest.java      |   220 -
 .../gateway/deploy/DeploymentFactoryTest.java   |   324 -
 ...enericProviderDeploymentContributorTest.java |    45 -
 ...viceDefinitionDeploymentContributorTest.java |    43 -
 .../descriptor/GatewayDescriptorTest.java       |   117 -
 .../xml/XmlGatewayDescriptorExporterTest.java   |   145 -
 .../xml/XmlGatewayDescriptorImporterTest.java   |   172 -
 .../hadoop/gateway/jetty/JettyPathMapTest.java  |    67 -
 .../hadoop/gateway/jetty/SslSocketTest.java     |   118 -
 .../hadoop/gateway/mock/MockConsoleFactory.java |    43 -
 .../metrics/impl/DefaultMetricsServiceTest.java |    93 -
 .../DefaultServiceDefinitionRegistryTest.java   |    46 -
 .../services/security/CryptoServiceTest.java    |   214 -
 .../topology/DefaultTopologyServiceTest.java    |   208 -
 .../builder/PropertyTopologyBuilderTest.java    |   173 -
 .../validation/TopologyValidatorTest.java       |    48 -
 .../topology/xml/TopologyRulesModuleTest.java   |   262 -
 .../apache/hadoop/gateway/util/KnoxCLITest.java |   649 -
 .../util/ServiceDefinitionsLoaderTest.java      |    49 -
 .../gateway/websockets/BadBackendTest.java      |   118 -
 .../hadoop/gateway/websockets/BadUrlTest.java   |   309 -
 .../websockets/ConnectionDroppedTest.java       |   203 -
 .../hadoop/gateway/websockets/EchoSocket.java   |    68 -
 .../gateway/websockets/MessageFailureTest.java  |   207 -
 .../gateway/websockets/WebsocketClient.java     |   131 -
 .../websockets/WebsocketEchoHandler.java        |    47 -
 .../gateway/websockets/WebsocketEchoTest.java   |   388 -
 .../WebsocketMultipleConnectionTest.java        |   390 -
 .../apache/knox/gateway/AuditLoggingTest.java   |   255 +
 .../apache/knox/gateway/GatewayFilterTest.java  |   171 +
 .../gateway/GatewayForwardingServletTest.java   |    66 +
 .../org/apache/knox/gateway/GatewayFuncTest.xml |    67 +
 .../knox/gateway/GatewayGlobalConfigTest.java   |   214 +
 .../gateway/GatewayPortMappingConfigTest.java   |   204 +
 .../org/apache/knox/gateway/TempletonDemo.java  |    70 +
 .../config/impl/GatewayConfigImplTest.java      |   220 +
 .../gateway/deploy/DeploymentFactoryTest.java   |   324 +
 ...enericProviderDeploymentContributorTest.java |    45 +
 ...viceDefinitionDeploymentContributorTest.java |    43 +
 .../descriptor/GatewayDescriptorTest.java       |   117 +
 .../xml/XmlGatewayDescriptorExporterTest.java   |   145 +
 .../xml/XmlGatewayDescriptorImporterTest.java   |   172 +
 .../knox/gateway/jetty/JettyPathMapTest.java    |    67 +
 .../knox/gateway/jetty/SslSocketTest.java       |   118 +
 .../knox/gateway/mock/MockConsoleFactory.java   |    43 +
 .../metrics/impl/DefaultMetricsServiceTest.java |    93 +
 .../DefaultServiceDefinitionRegistryTest.java   |    46 +
 .../services/security/CryptoServiceTest.java    |   214 +
 .../topology/DefaultTopologyServiceTest.java    |   215 +
 .../builder/PropertyTopologyBuilderTest.java    |   173 +
 .../validation/TopologyValidatorTest.java       |    48 +
 .../topology/xml/TopologyRulesModuleTest.java   |   262 +
 .../apache/knox/gateway/util/KnoxCLITest.java   |   649 +
 .../util/ServiceDefinitionsLoaderTest.java      |    50 +
 .../knox/gateway/websockets/BadBackendTest.java |   117 +
 .../knox/gateway/websockets/BadUrlTest.java     |   309 +
 .../websockets/ConnectionDroppedTest.java       |   198 +
 .../knox/gateway/websockets/EchoSocket.java     |    68 +
 .../gateway/websockets/MessageFailureTest.java  |   207 +
 .../gateway/websockets/WebsocketClient.java     |   131 +
 .../websockets/WebsocketEchoHandler.java        |    47 +
 .../gateway/websockets/WebsocketEchoTest.java   |   388 +
 .../WebsocketMultipleConnectionTest.java        |   389 +
 .../test/resources/gateway-demo-insecure.xml    |    46 +-
 .../src/test/resources/gateway-demo-secure.xml  |    24 +-
 .../apache/hadoop/gateway/GatewayFuncTest.xml   |    69 -
 .../gateway/topology/file/topology-one.xml      |    12 -
 .../gateway/topology/file/topology-three.xml    |    12 -
 .../gateway/topology/file/topology-two.xml      |    12 -
 .../topology-valid-complete.xml                 |    40 -
 .../topology-valid-with-name.xml                |    19 -
 .../TopologyValidatorTest/topology-valid.xml    |    25 -
 .../topology-with-application.xml               |    23 -
 .../service-param-topology-ambari-format.conf   |    55 -
 .../xml/service-param-topology-knox-format.xml  |    43 -
 .../xml/simple-topology-ambari-format.conf      |    79 -
 .../xml/simple-topology-knox-format.xml         |    81 -
 .../org/apache/knox/gateway/GatewayFuncTest.xml |    69 +
 .../knox/gateway/topology/file/topology-one.xml |    12 +
 .../gateway/topology/file/topology-three.xml    |    12 +
 .../knox/gateway/topology/file/topology-two.xml |    12 +
 .../topology-valid-complete.xml                 |    40 +
 .../topology-valid-with-name.xml                |    19 +
 .../TopologyValidatorTest/topology-valid.xml    |    25 +
 .../topology-with-application.xml               |    23 +
 .../service-param-topology-ambari-format.conf   |    55 +
 .../xml/service-param-topology-knox-format.xml  |    43 +
 .../xml/simple-topology-ambari-format.conf      |    79 +
 .../xml/simple-topology-knox-format.xml         |    81 +
 .../service/admin/TopologiesResource.java       |   311 -
 .../admin/TopologyCollectionMarshaller.java     |    70 -
 .../service/admin/TopologyMarshaller.java       |   100 -
 .../service/admin/VersionMarshaller.java        |    72 -
 .../gateway/service/admin/VersionResource.java  |    96 -
 .../service/admin/beans/Application.java        |    34 -
 .../service/admin/beans/BeanConverter.java      |   164 -
 .../gateway/service/admin/beans/Param.java      |    57 -
 .../gateway/service/admin/beans/Provider.java   |    75 -
 .../gateway/service/admin/beans/Service.java    |    87 -
 .../gateway/service/admin/beans/Topology.java   |   108 -
 .../AdminServiceDeploymentContributor.java      |    59 -
 .../service/admin/TopologiesResource.java       |   312 +
 .../admin/TopologyCollectionMarshaller.java     |    70 +
 .../service/admin/TopologyMarshaller.java       |   100 +
 .../service/admin/VersionMarshaller.java        |    72 +
 .../gateway/service/admin/VersionResource.java  |    96 +
 .../service/admin/beans/Application.java        |    34 +
 .../service/admin/beans/BeanConverter.java      |   168 +
 .../knox/gateway/service/admin/beans/Param.java |    57 +
 .../gateway/service/admin/beans/Provider.java   |    74 +
 .../gateway/service/admin/beans/Service.java    |    87 +
 .../gateway/service/admin/beans/Topology.java   |   108 +
 .../AdminServiceDeploymentContributor.java      |    59 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../gateway/service/admin/beans/jaxb.properties |    16 -
 .../gateway/service/admin/jaxb.properties       |    16 -
 .../gateway/service/admin/beans/jaxb.properties |    16 +
 .../knox/gateway/service/admin/jaxb.properties  |    16 +
 .../service/admin/TopologyMarshallerTest.java   |    60 -
 .../service/admin/TopologyResourceTest.java     |   185 -
 .../service/admin/TopologyMarshallerTest.java   |    61 +
 .../service/admin/TopologyResourceTest.java     |   185 +
 .../gateway/as/ASDeploymentContributor.java     |    58 -
 .../gateway/as/ASDeploymentContributor.java     |    55 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../service/definition/CustomDispatch.java      |    80 -
 .../gateway/service/definition/Policy.java      |    45 -
 .../gateway/service/definition/Rewrite.java     |    47 -
 .../gateway/service/definition/Route.java       |    73 -
 .../service/definition/ServiceDefinition.java   |   109 -
 .../service/definition/CustomDispatch.java      |    80 +
 .../knox/gateway/service/definition/Policy.java |    45 +
 .../gateway/service/definition/Rewrite.java     |    47 +
 .../knox/gateway/service/definition/Route.java  |    73 +
 .../service/definition/ServiceDefinition.java   |   108 +
 .../definition/ServiceDefinitionTest.java       |    90 -
 .../definition/ServiceDefinitionTest.java       |    90 +
 .../hadoop/gateway/hbase/HBaseDispatch.java     |    52 -
 .../gateway/hbase/HBaseHttpClientDispatch.java  |    38 -
 .../knox/gateway/hbase/HBaseDispatch.java       |    52 +
 .../gateway/hbase/HBaseHttpClientDispatch.java  |    38 +
 .../HBaseDeploymentContributor/rewrite.xml      |    62 -
 .../HBaseDeploymentContributor/rewrite.xml      |    62 +
 .../hadoop/gateway/hbase/HBaseDispatchTest.java |    88 -
 .../knox/gateway/hbase/HBaseDispatchTest.java   |    88 +
 .../service/health/HealthServiceMessages.java   |    32 -
 .../gateway/service/health/MetricsResource.java |   142 -
 .../gateway/service/health/PingResource.java    |    93 -
 .../HealthServiceDeploymentContributor.java     |    55 -
 .../service/health/HealthServiceMessages.java   |    32 +
 .../gateway/service/health/MetricsResource.java |   142 +
 .../gateway/service/health/PingResource.java    |    92 +
 .../HealthServiceDeploymentContributor.java     |    55 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../service/health/MetricsResourceTest.java     |    32 -
 .../service/health/PingResourceTest.java        |    30 -
 .../service/health/MetricsResourceTest.java     |    32 +
 .../service/health/PingResourceTest.java        |    29 +
 .../hadoop/gateway/hive/HiveDispatch.java       |    53 -
 .../hadoop/gateway/hive/HiveDispatchUtils.java  |    38 -
 .../hadoop/gateway/hive/HiveHaDispatch.java     |    48 -
 .../gateway/hive/HiveHttpClientDispatch.java    |    38 -
 .../apache/knox/gateway/hive/HiveDispatch.java  |    53 +
 .../knox/gateway/hive/HiveDispatchUtils.java    |    38 +
 .../knox/gateway/hive/HiveHaDispatch.java       |    48 +
 .../gateway/hive/HiveHttpClientDispatch.java    |    38 +
 .../service/knoxsso/KnoxSSOMessages.java        |    66 -
 .../gateway/service/knoxsso/WebSSOResource.java |   322 -
 .../KnoxSSOServiceDeploymentContributor.java    |    56 -
 .../service/knoxsso/KnoxSSOMessages.java        |    66 +
 .../gateway/service/knoxsso/WebSSOResource.java |   322 +
 .../KnoxSSOServiceDeploymentContributor.java    |    57 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../service/knoxsso/WebSSOResourceTest.java     |    71 -
 .../service/knoxsso/WebSSOResourceTest.java     |    71 +
 .../service/knoxsso/KnoxSSOutMessages.java      |    29 -
 .../service/knoxsso/WebSSOutResource.java       |   106 -
 .../KnoxSSOutServiceDeploymentContributor.java  |    56 -
 .../service/knoxsso/KnoxSSOutMessages.java      |    28 +
 .../service/knoxsso/WebSSOutResource.java       |   106 +
 .../KnoxSSOutServiceDeploymentContributor.java  |    56 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../service/knoxsso/WebSSOutResourceTest.java   |    32 -
 .../service/knoxsso/WebSSOutResourceTest.java   |    32 +
 .../service/knoxtoken/TokenResource.java        |   181 -
 .../service/knoxtoken/TokenServiceMessages.java |    66 -
 .../TokenServiceDeploymentContributor.java      |    55 -
 .../service/knoxtoken/TokenResource.java        |   182 +
 .../service/knoxtoken/TokenServiceMessages.java |    66 +
 .../TokenServiceDeploymentContributor.java      |    55 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../knoxtoken/TokenServiceResourceTest.java     |    53 -
 .../knoxtoken/TokenServiceResourceTest.java     |    52 +
 .../gateway/rm/dispatch/RMHaBaseDispatcher.java |   220 -
 .../gateway/rm/dispatch/RMHaDispatch.java       |    54 -
 .../gateway/rm/dispatch/RMUIHaDispatch.java     |    54 -
 .../gateway/rm/dispatch/SafeModeException.java  |    21 -
 .../gateway/rm/dispatch/StandbyException.java   |    21 -
 .../hadoop/gateway/rm/i18n/RMMessages.java      |    46 -
 .../gateway/rm/dispatch/RMHaBaseDispatcher.java |   220 +
 .../knox/gateway/rm/dispatch/RMHaDispatch.java  |    52 +
 .../gateway/rm/dispatch/RMUIHaDispatch.java     |    54 +
 .../gateway/rm/dispatch/SafeModeException.java  |    21 +
 .../gateway/rm/dispatch/StandbyException.java   |    21 +
 .../apache/knox/gateway/rm/i18n/RMMessages.java |    46 +
 .../gateway/rm/dispatch/RMHaDispatchTest.java   |   219 -
 .../gateway/rm/dispatch/RMHaDispatchTest.java   |   219 +
 .../hadoop/gateway/storm/StormDispatch.java     |    35 -
 .../knox/gateway/storm/StormDispatch.java       |    35 +
 .../service/test/ServiceTestResource.java       |   417 -
 .../gateway/service/test/ServiceTestURL.java    |    89 -
 .../test/ServiceTestWrapperMarshaller.java      |    72 -
 .../ServiceTestDeploymentContributor.java       |   102 -
 .../service/test/ServiceTestResource.java       |   417 +
 .../gateway/service/test/ServiceTestURL.java    |    89 +
 .../test/ServiceTestWrapperMarshaller.java      |    72 +
 .../ServiceTestDeploymentContributor.java       |   102 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../hadoop/gateway/service/test/jaxb.properties |    16 -
 .../knox/gateway/service/test/jaxb.properties   |    16 +
 .../gateway/tgs/TGSDeploymentContributor.java   |    58 -
 .../gateway/tgs/TGSDeploymentContributor.java   |    55 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../service/vault/CredentialResource.java       |   141 -
 .../VaultServiceDeploymentContributor.java      |    60 -
 .../service/vault/CredentialResource.java       |   139 +
 .../VaultServiceDeploymentContributor.java      |    60 +
 ....gateway.deploy.ServiceDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    19 +
 .../hdfs/JobTrackerDeploymentContributor.java   |    41 -
 .../hdfs/NameNodeDeploymentContributor.java     |    41 -
 .../gateway/hdfs/dispatch/HdfsDispatch.java     |    37 -
 .../hdfs/dispatch/HdfsHttpClientDispatch.java   |    45 -
 .../hdfs/dispatch/SafeModeException.java        |    21 -
 .../gateway/hdfs/dispatch/StandbyException.java |    21 -
 .../hdfs/dispatch/WebHdfsHaDispatch.java        |   184 -
 .../dispatch/WebHdfsHaHttpClientDispatch.java   |    38 -
 .../gateway/hdfs/i18n/WebHdfsMessages.java      |    43 -
 .../hdfs/JobTrackerDeploymentContributor.java   |    41 +
 .../hdfs/NameNodeDeploymentContributor.java     |    41 +
 .../gateway/hdfs/dispatch/HdfsDispatch.java     |    37 +
 .../hdfs/dispatch/HdfsHttpClientDispatch.java   |    46 +
 .../hdfs/dispatch/SafeModeException.java        |    21 +
 .../gateway/hdfs/dispatch/StandbyException.java |    21 +
 .../hdfs/dispatch/WebHdfsHaDispatch.java        |   184 +
 .../dispatch/WebHdfsHaHttpClientDispatch.java   |    38 +
 .../knox/gateway/hdfs/i18n/WebHdfsMessages.java |    43 +
 ....gateway.deploy.ServiceDeploymentContributor |    20 -
 ....gateway.deploy.ServiceDeploymentContributor |    20 +
 .../WebHdfsDeploymentContributor/rewrite.xml    |    70 -
 .../WebHdfsDeploymentContributor/rewrite.xml    |    70 +
 .../hdfs/dispatch/WebHdfsHaDispatchTest.java    |   105 -
 .../hdfs/dispatch/WebHdfsHaDispatchTest.java    |   105 +
 gateway-shell-launcher/pom.xml                  |     2 +-
 gateway-shell-release/pom.xml                   |     2 +-
 .../shell/AbstractCredentialCollector.java      |    74 -
 .../AbstractJavaConsoleCredentialCollector.java |    66 -
 .../hadoop/gateway/shell/AbstractRequest.java   |   113 -
 .../hadoop/gateway/shell/BasicResponse.java     |    99 -
 .../shell/ClearInputCredentialCollector.java    |    45 -
 .../hadoop/gateway/shell/ClientContext.java     |   211 -
 .../shell/CredentialCollectionException.java    |    34 -
 .../gateway/shell/CredentialCollector.java      |    29 -
 .../hadoop/gateway/shell/Credentials.java       |    63 -
 .../hadoop/gateway/shell/EmptyResponse.java     |    29 -
 .../hadoop/gateway/shell/ErrorResponse.java     |    35 -
 .../org/apache/hadoop/gateway/shell/Hadoop.java |   307 -
 .../hadoop/gateway/shell/HadoopException.java   |    34 -
 .../shell/HiddenInputCredentialCollector.java   |    45 -
 .../org/apache/hadoop/gateway/shell/KnoxSh.java |   308 -
 .../shell/KnoxTokenCredentialCollector.java     |    82 -
 .../org/apache/hadoop/gateway/shell/Shell.java  |    66 -
 .../gateway/shell/hbase/ClusterVersion.java     |    55 -
 .../hadoop/gateway/shell/hbase/Example.groovy   |   173 -
 .../hadoop/gateway/shell/hbase/HBase.java       |    56 -
 .../hadoop/gateway/shell/hbase/Status.java      |    55 -
 .../gateway/shell/hbase/SystemVersion.java      |    55 -
 .../gateway/shell/hbase/table/Attribute.java    |    36 -
 .../gateway/shell/hbase/table/CreateTable.java  |   117 -
 .../gateway/shell/hbase/table/DeleteTable.java  |    58 -
 .../gateway/shell/hbase/table/Family.java       |    55 -
 .../shell/hbase/table/FamilyContainer.java      |    22 -
 .../hadoop/gateway/shell/hbase/table/Table.java |    88 -
 .../gateway/shell/hbase/table/TableList.java    |    56 -
 .../gateway/shell/hbase/table/TableRegions.java |    59 -
 .../gateway/shell/hbase/table/TableSchema.java  |    59 -
 .../shell/hbase/table/TruncateTable.java        |    79 -
 .../gateway/shell/hbase/table/UpdateTable.java  |   107 -
 .../gateway/shell/hbase/table/row/Column.java   |    48 -
 .../shell/hbase/table/row/DeleteRows.java       |    93 -
 .../shell/hbase/table/row/InsertableColumn.java |    50 -
 .../shell/hbase/table/row/QueryRows.java        |   126 -
 .../gateway/shell/hbase/table/row/Row.java      |    50 -
 .../gateway/shell/hbase/table/row/StoreRow.java |   116 -
 .../hbase/table/scanner/CreateScanner.java      |   201 -
 .../hbase/table/scanner/DeleteScanner.java      |    60 -
 .../shell/hbase/table/scanner/Scanner.java      |    50 -
 .../hbase/table/scanner/ScannerGetNext.java     |    61 -
 .../hadoop/gateway/shell/hdfs/Example.groovy    |    57 -
 .../apache/hadoop/gateway/shell/hdfs/Get.java   |    79 -
 .../apache/hadoop/gateway/shell/hdfs/Hdfs.java  |    54 -
 .../apache/hadoop/gateway/shell/hdfs/Ls.java    |    66 -
 .../apache/hadoop/gateway/shell/hdfs/Mkdir.java |    72 -
 .../apache/hadoop/gateway/shell/hdfs/Put.java   |   139 -
 .../hadoop/gateway/shell/hdfs/Rename.java       |    69 -
 .../apache/hadoop/gateway/shell/hdfs/Rm.java    |    78 -
 .../hadoop/gateway/shell/hdfs/Status.java       |    68 -
 .../hadoop/gateway/shell/job/ExampleHive.groovy |    53 -
 .../hadoop/gateway/shell/job/ExampleJava.groovy |    55 -
 .../hadoop/gateway/shell/job/ExamplePig.groovy  |    57 -
 .../apache/hadoop/gateway/shell/job/Hive.java   |    98 -
 .../apache/hadoop/gateway/shell/job/Java.java   |   106 -
 .../apache/hadoop/gateway/shell/job/Job.java    |    50 -
 .../apache/hadoop/gateway/shell/job/Pig.java    |    98 -
 .../apache/hadoop/gateway/shell/job/Queue.java  |    58 -
 .../apache/hadoop/gateway/shell/job/Sqoop.java  |    99 -
 .../apache/hadoop/gateway/shell/job/Status.java |    65 -
 .../hadoop/gateway/shell/knox/token/Get.java    |    57 -
 .../hadoop/gateway/shell/knox/token/Token.java  |    29 -
 .../gateway/shell/workflow/Example.groovy       |    85 -
 .../hadoop/gateway/shell/workflow/Status.java   |    65 -
 .../hadoop/gateway/shell/workflow/Submit.java   |    96 -
 .../hadoop/gateway/shell/workflow/Workflow.java |    34 -
 .../hadoop/gateway/shell/yarn/AppState.java     |    69 -
 .../gateway/shell/yarn/ExampleYarnApp.groovy    |    87 -
 .../hadoop/gateway/shell/yarn/KillApp.java      |    68 -
 .../hadoop/gateway/shell/yarn/NewApp.java       |    62 -
 .../hadoop/gateway/shell/yarn/SubmitApp.java    |    81 -
 .../apache/hadoop/gateway/shell/yarn/Yarn.java  |    42 -
 .../shell/AbstractCredentialCollector.java      |    74 +
 .../AbstractJavaConsoleCredentialCollector.java |    66 +
 .../knox/gateway/shell/AbstractRequest.java     |   113 +
 .../knox/gateway/shell/BasicResponse.java       |    99 +
 .../shell/ClearInputCredentialCollector.java    |    45 +
 .../knox/gateway/shell/ClientContext.java       |   211 +
 .../shell/CredentialCollectionException.java    |    34 +
 .../knox/gateway/shell/CredentialCollector.java |    29 +
 .../apache/knox/gateway/shell/Credentials.java  |    63 +
 .../knox/gateway/shell/EmptyResponse.java       |    29 +
 .../knox/gateway/shell/ErrorResponse.java       |    35 +
 .../org/apache/knox/gateway/shell/Hadoop.java   |   307 +
 .../knox/gateway/shell/HadoopException.java     |    34 +
 .../shell/HiddenInputCredentialCollector.java   |    45 +
 .../org/apache/knox/gateway/shell/KnoxSh.java   |   306 +
 .../shell/KnoxTokenCredentialCollector.java     |    82 +
 .../org/apache/knox/gateway/shell/Shell.java    |    66 +
 .../gateway/shell/hbase/ClusterVersion.java     |    55 +
 .../knox/gateway/shell/hbase/Example.groovy     |   173 +
 .../apache/knox/gateway/shell/hbase/HBase.java  |    56 +
 .../apache/knox/gateway/shell/hbase/Status.java |    55 +
 .../knox/gateway/shell/hbase/SystemVersion.java |    55 +
 .../gateway/shell/hbase/table/Attribute.java    |    36 +
 .../gateway/shell/hbase/table/CreateTable.java  |   117 +
 .../gateway/shell/hbase/table/DeleteTable.java  |    58 +
 .../knox/gateway/shell/hbase/table/Family.java  |    55 +
 .../shell/hbase/table/FamilyContainer.java      |    22 +
 .../knox/gateway/shell/hbase/table/Table.java   |    88 +
 .../gateway/shell/hbase/table/TableList.java    |    56 +
 .../gateway/shell/hbase/table/TableRegions.java |    59 +
 .../gateway/shell/hbase/table/TableSchema.java  |    59 +
 .../shell/hbase/table/TruncateTable.java        |    79 +
 .../gateway/shell/hbase/table/UpdateTable.java  |   107 +
 .../gateway/shell/hbase/table/row/Column.java   |    48 +
 .../shell/hbase/table/row/DeleteRows.java       |    93 +
 .../shell/hbase/table/row/InsertableColumn.java |    50 +
 .../shell/hbase/table/row/QueryRows.java        |   126 +
 .../knox/gateway/shell/hbase/table/row/Row.java |    50 +
 .../gateway/shell/hbase/table/row/StoreRow.java |   116 +
 .../hbase/table/scanner/CreateScanner.java      |   201 +
 .../hbase/table/scanner/DeleteScanner.java      |    60 +
 .../shell/hbase/table/scanner/Scanner.java      |    50 +
 .../hbase/table/scanner/ScannerGetNext.java     |    61 +
 .../knox/gateway/shell/hdfs/Example.groovy      |    57 +
 .../org/apache/knox/gateway/shell/hdfs/Get.java |    79 +
 .../apache/knox/gateway/shell/hdfs/Hdfs.java    |    54 +
 .../org/apache/knox/gateway/shell/hdfs/Ls.java  |    66 +
 .../apache/knox/gateway/shell/hdfs/Mkdir.java   |    72 +
 .../org/apache/knox/gateway/shell/hdfs/Put.java |   139 +
 .../apache/knox/gateway/shell/hdfs/Rename.java  |    69 +
 .../org/apache/knox/gateway/shell/hdfs/Rm.java  |    78 +
 .../apache/knox/gateway/shell/hdfs/Status.java  |    68 +
 .../knox/gateway/shell/job/ExampleHive.groovy   |    53 +
 .../knox/gateway/shell/job/ExampleJava.groovy   |    55 +
 .../knox/gateway/shell/job/ExamplePig.groovy    |    57 +
 .../org/apache/knox/gateway/shell/job/Hive.java |    98 +
 .../org/apache/knox/gateway/shell/job/Java.java |   106 +
 .../org/apache/knox/gateway/shell/job/Job.java  |    50 +
 .../org/apache/knox/gateway/shell/job/Pig.java  |    98 +
 .../apache/knox/gateway/shell/job/Queue.java    |    58 +
 .../apache/knox/gateway/shell/job/Sqoop.java    |    99 +
 .../apache/knox/gateway/shell/job/Status.java   |    65 +
 .../knox/gateway/shell/knox/token/Get.java      |    57 +
 .../knox/gateway/shell/knox/token/Token.java    |    29 +
 .../knox/gateway/shell/workflow/Example.groovy  |    85 +
 .../knox/gateway/shell/workflow/Status.java     |    65 +
 .../knox/gateway/shell/workflow/Submit.java     |    96 +
 .../knox/gateway/shell/workflow/Workflow.java   |    34 +
 .../knox/gateway/shell/yarn/AppState.java       |    69 +
 .../gateway/shell/yarn/ExampleYarnApp.groovy    |    87 +
 .../apache/knox/gateway/shell/yarn/KillApp.java |    68 +
 .../apache/knox/gateway/shell/yarn/NewApp.java  |    62 +
 .../knox/gateway/shell/yarn/SubmitApp.java      |    81 +
 .../apache/knox/gateway/shell/yarn/Yarn.java    |    42 +
 ...che.hadoop.gateway.shell.CredentialCollector |    21 -
 ...pache.knox.gateway.shell.CredentialCollector |    21 +
 .../hadoop/gateway/SpiGatewayMessages.java      |    76 -
 .../hadoop/gateway/SpiGatewayResources.java     |    38 -
 .../config/FilterConfigurationAdapter.java      |    38 -
 .../FilterConfigurationAdapterDescriptor.java   |    29 -
 .../hadoop/gateway/config/GatewayConfig.java    |   300 -
 .../gateway/deploy/DeploymentContext.java       |    53 -
 .../deploy/DeploymentContributorBase.java       |    37 -
 .../deploy/ProviderDeploymentContributor.java   |    56 -
 .../ProviderDeploymentContributorBase.java      |    36 -
 .../deploy/ServiceDeploymentContributor.java    |    48 -
 .../ServiceDeploymentContributorBase.java       |   114 -
 .../gateway/descriptor/FilterDescriptor.java    |    51 -
 .../descriptor/FilterParamDescriptor.java       |    34 -
 .../gateway/descriptor/GatewayDescriptor.java   |    42 -
 .../descriptor/GatewayDescriptorExporter.java   |    29 -
 .../descriptor/GatewayDescriptorImporter.java   |    29 -
 .../descriptor/GatewayParamDescriptor.java      |    34 -
 .../gateway/descriptor/ResourceDescriptor.java  |    58 -
 .../descriptor/ResourceParamDescriptor.java     |    34 -
 .../dispatch/AbstractGatewayDispatch.java       |   144 -
 .../dispatch/CappedBufferHttpEntity.java        |   150 -
 .../gateway/dispatch/DefaultDispatch.java       |   319 -
 .../dispatch/DefaultHttpClientFactory.java      |   233 -
 .../hadoop/gateway/dispatch/Dispatch.java       |    56 -
 .../gateway/dispatch/GatewayDispatchFilter.java |   171 -
 .../gateway/dispatch/HadoopAuthCookieStore.java |    31 -
 .../gateway/dispatch/HttpClientDispatch.java    |    35 -
 .../gateway/dispatch/HttpClientFactory.java     |    27 -
 .../gateway/dispatch/InputStreamEntity.java     |   150 -
 .../gateway/dispatch/KnoxSpnegoAuthScheme.java  |    54 -
 .../dispatch/KnoxSpnegoAuthSchemeFactory.java   |    38 -
 .../dispatch/PartiallyRepeatableHttpEntity.java |   161 -
 .../dispatch/PassAllHeadersDispatch.java        |    46 -
 .../PassAllHeadersNoEncodingDispatch.java       |    50 -
 .../gateway/filter/AbstractGatewayFilter.java   |    99 -
 .../hadoop/gateway/filter/GatewayRequest.java   |    27 -
 .../gateway/filter/GatewayRequestWrapper.java   |    42 -
 .../hadoop/gateway/filter/GatewayResponse.java  |    34 -
 .../gateway/filter/GatewayResponseWrapper.java  |    68 -
 .../hadoop/gateway/filter/ResponseStreamer.java |    28 -
 .../security/AbstractIdentityAssertionBase.java |    36 -
 .../AbstractIdentityAssertionFilter.java        |   211 -
 .../hadoop/gateway/i18n/GatewaySpiMessages.java |    85 -
 .../gateway/i18n/GatewaySpiResources.java       |    30 -
 .../hadoop/gateway/security/GroupPrincipal.java |    32 -
 .../gateway/security/ImpersonatedPrincipal.java |    33 -
 .../gateway/security/PrimaryPrincipal.java      |    33 -
 .../hadoop/gateway/security/PromptUtils.java    |    82 -
 .../hadoop/gateway/security/SubjectUtils.java   |    96 -
 .../gateway/security/UsernamePassword.java      |    45 -
 .../security/principal/PrincipalMapper.java     |    47 -
 .../principal/PrincipalMappingException.java    |    30 -
 .../principal/SimplePrincipalMapper.java        |   124 -
 .../gateway/services/GatewayServices.java       |    46 -
 .../gateway/services/ServerInfoService.java     |    34 -
 .../apache/hadoop/gateway/services/Service.java |    31 -
 .../services/ServiceLifecycleException.java     |    30 -
 .../services/hostmap/FileBasedHostMapper.java   |    81 -
 .../gateway/services/hostmap/HostMapper.java    |    37 -
 .../services/hostmap/HostMapperService.java     |    41 -
 .../metrics/InstrumentationProvider.java        |    26 -
 .../InstrumentationProviderDescriptor.java      |    25 -
 .../services/metrics/MetricsContext.java        |    27 -
 .../services/metrics/MetricsReporter.java       |    33 -
 .../metrics/MetricsReporterException.java       |    29 -
 .../services/metrics/MetricsService.java        |    28 -
 .../services/registry/ServiceDefEntry.java      |    27 -
 .../registry/ServiceDefinitionRegistry.java     |    25 -
 .../services/registry/ServiceRegistry.java      |    34 -
 .../gateway/services/security/AliasService.java |    55 -
 .../security/AliasServiceException.java         |    27 -
 .../services/security/CryptoService.java        |    35 -
 .../services/security/EncryptionResult.java     |    70 -
 .../services/security/KeystoreService.java      |    54 -
 .../security/KeystoreServiceException.java      |    30 -
 .../services/security/MasterService.java        |    22 -
 .../gateway/services/security/SSLService.java   |    29 -
 .../security/impl/BaseKeystoreService.java      |   234 -
 .../security/impl/CMFKeystoreService.java       |   169 -
 .../security/impl/CMFMasterService.java         |   204 -
 .../security/impl/ConfigurableEncryptor.java    |   188 -
 .../security/impl/X509CertificateUtil.java      |   303 -
 .../security/token/JWTokenAuthority.java        |    52 -
 .../security/token/TokenServiceException.java   |    37 -
 .../services/security/token/impl/JWT.java       |    60 -
 .../token/impl/JWTProviderMessages.java         |    61 -
 .../services/security/token/impl/JWTToken.java  |   278 -
 .../services/topology/TopologyService.java      |    50 -
 .../hadoop/gateway/topology/Application.java    |    30 -
 .../apache/hadoop/gateway/topology/Param.java   |    50 -
 .../hadoop/gateway/topology/Provider.java       |    85 -
 .../hadoop/gateway/topology/Routable.java       |    22 -
 .../apache/hadoop/gateway/topology/Service.java |   150 -
 .../hadoop/gateway/topology/Topology.java       |   142 -
 .../hadoop/gateway/topology/TopologyEvent.java  |    40 -
 .../gateway/topology/TopologyListener.java      |    26 -
 .../gateway/topology/TopologyMonitor.java       |    28 -
 .../gateway/topology/TopologyProvider.java      |    26 -
 .../apache/hadoop/gateway/topology/Version.java |   135 -
 .../topology/builder/TopologyBuilder.java       |    24 -
 .../apache/knox/gateway/SpiGatewayMessages.java |    76 +
 .../knox/gateway/SpiGatewayResources.java       |    38 +
 .../config/FilterConfigurationAdapter.java      |    38 +
 .../FilterConfigurationAdapterDescriptor.java   |    29 +
 .../knox/gateway/config/GatewayConfig.java      |   300 +
 .../knox/gateway/deploy/DeploymentContext.java  |    53 +
 .../deploy/DeploymentContributorBase.java       |    37 +
 .../deploy/ProviderDeploymentContributor.java   |    56 +
 .../ProviderDeploymentContributorBase.java      |    36 +
 .../deploy/ServiceDeploymentContributor.java    |    48 +
 .../ServiceDeploymentContributorBase.java       |   114 +
 .../gateway/descriptor/FilterDescriptor.java    |    51 +
 .../descriptor/FilterParamDescriptor.java       |    34 +
 .../gateway/descriptor/GatewayDescriptor.java   |    42 +
 .../descriptor/GatewayDescriptorExporter.java   |    29 +
 .../descriptor/GatewayDescriptorImporter.java   |    29 +
 .../descriptor/GatewayParamDescriptor.java      |    34 +
 .../gateway/descriptor/ResourceDescriptor.java  |    58 +
 .../descriptor/ResourceParamDescriptor.java     |    34 +
 .../dispatch/AbstractGatewayDispatch.java       |   144 +
 .../dispatch/CappedBufferHttpEntity.java        |   150 +
 .../knox/gateway/dispatch/DefaultDispatch.java  |   319 +
 .../dispatch/DefaultHttpClientFactory.java      |   233 +
 .../apache/knox/gateway/dispatch/Dispatch.java  |    56 +
 .../gateway/dispatch/GatewayDispatchFilter.java |   169 +
 .../gateway/dispatch/HadoopAuthCookieStore.java |    31 +
 .../gateway/dispatch/HttpClientDispatch.java    |    35 +
 .../gateway/dispatch/HttpClientFactory.java     |    27 +
 .../gateway/dispatch/InputStreamEntity.java     |   150 +
 .../gateway/dispatch/KnoxSpnegoAuthScheme.java  |    54 +
 .../dispatch/KnoxSpnegoAuthSchemeFactory.java   |    38 +
 .../dispatch/PartiallyRepeatableHttpEntity.java |   161 +
 .../dispatch/PassAllHeadersDispatch.java        |    46 +
 .../PassAllHeadersNoEncodingDispatch.java       |    50 +
 .../gateway/filter/AbstractGatewayFilter.java   |    99 +
 .../knox/gateway/filter/GatewayRequest.java     |    27 +
 .../gateway/filter/GatewayRequestWrapper.java   |    42 +
 .../knox/gateway/filter/GatewayResponse.java    |    34 +
 .../gateway/filter/GatewayResponseWrapper.java  |    68 +
 .../knox/gateway/filter/ResponseStreamer.java   |    28 +
 .../security/AbstractIdentityAssertionBase.java |    36 +
 .../AbstractIdentityAssertionFilter.java        |   211 +
 .../knox/gateway/i18n/GatewaySpiMessages.java   |    85 +
 .../knox/gateway/i18n/GatewaySpiResources.java  |    30 +
 .../knox/gateway/security/GroupPrincipal.java   |    32 +
 .../gateway/security/ImpersonatedPrincipal.java |    33 +
 .../knox/gateway/security/PrimaryPrincipal.java |    33 +
 .../knox/gateway/security/PromptUtils.java      |    82 +
 .../knox/gateway/security/SubjectUtils.java     |    96 +
 .../knox/gateway/security/UsernamePassword.java |    45 +
 .../security/principal/PrincipalMapper.java     |    47 +
 .../principal/PrincipalMappingException.java    |    30 +
 .../principal/SimplePrincipalMapper.java        |   124 +
 .../knox/gateway/services/GatewayServices.java  |    46 +
 .../gateway/services/ServerInfoService.java     |    34 +
 .../apache/knox/gateway/services/Service.java   |    30 +
 .../services/ServiceLifecycleException.java     |    30 +
 .../services/hostmap/FileBasedHostMapper.java   |    81 +
 .../gateway/services/hostmap/HostMapper.java    |    37 +
 .../services/hostmap/HostMapperService.java     |    41 +
 .../metrics/InstrumentationProvider.java        |    26 +
 .../InstrumentationProviderDescriptor.java      |    25 +
 .../services/metrics/MetricsContext.java        |    27 +
 .../services/metrics/MetricsReporter.java       |    33 +
 .../metrics/MetricsReporterException.java       |    29 +
 .../services/metrics/MetricsService.java        |    28 +
 .../services/registry/ServiceDefEntry.java      |    27 +
 .../registry/ServiceDefinitionRegistry.java     |    25 +
 .../services/registry/ServiceRegistry.java      |    34 +
 .../gateway/services/security/AliasService.java |    55 +
 .../security/AliasServiceException.java         |    27 +
 .../services/security/CryptoService.java        |    35 +
 .../services/security/EncryptionResult.java     |    70 +
 .../services/security/KeystoreService.java      |    54 +
 .../security/KeystoreServiceException.java      |    30 +
 .../services/security/MasterService.java        |    22 +
 .../gateway/services/security/SSLService.java   |    29 +
 .../security/impl/BaseKeystoreService.java      |   233 +
 .../security/impl/CMFKeystoreService.java       |   167 +
 .../security/impl/CMFMasterService.java         |   204 +
 .../security/impl/ConfigurableEncryptor.java    |   188 +
 .../security/impl/X509CertificateUtil.java      |   303 +
 .../security/token/JWTokenAuthority.java        |    52 +
 .../security/token/TokenServiceException.java   |    37 +
 .../services/security/token/impl/JWT.java       |    60 +
 .../token/impl/JWTProviderMessages.java         |    61 +
 .../services/security/token/impl/JWTToken.java  |   278 +
 .../services/topology/TopologyService.java      |    50 +
 .../knox/gateway/topology/Application.java      |    30 +
 .../org/apache/knox/gateway/topology/Param.java |    50 +
 .../apache/knox/gateway/topology/Provider.java  |    85 +
 .../apache/knox/gateway/topology/Routable.java  |    22 +
 .../apache/knox/gateway/topology/Service.java   |   150 +
 .../apache/knox/gateway/topology/Topology.java  |   142 +
 .../knox/gateway/topology/TopologyEvent.java    |    40 +
 .../knox/gateway/topology/TopologyListener.java |    26 +
 .../knox/gateway/topology/TopologyMonitor.java  |    28 +
 .../knox/gateway/topology/TopologyProvider.java |    26 +
 .../apache/knox/gateway/topology/Version.java   |   135 +
 .../topology/builder/TopologyBuilder.java       |    24 +
 ...ay.config.spi.ConfigurationAdapterDescriptor |    18 -
 ...ay.config.spi.ConfigurationAdapterDescriptor |    18 +
 .../apache/hadoop/gateway/topology/jaxb.index   |    22 -
 .../hadoop/gateway/topology/jaxb.properties     |    16 -
 .../gateway/topology/topology_binding-json.xml  |    65 -
 .../gateway/topology/topology_binding-xml.xml   |    63 -
 .../org/apache/knox/gateway/topology/jaxb.index |    22 +
 .../knox/gateway/topology/jaxb.properties       |    16 +
 .../gateway/topology/topology_binding-json.xml  |    65 +
 .../gateway/topology/topology_binding-xml.xml   |    63 +
 .../dispatch/CappedBufferHttpEntityTest.java    |   854 --
 .../gateway/dispatch/DefaultDispatchTest.java   |   234 -
 .../PartiallyRepeatableHttpEntityTest.java      |   874 --
 .../security/principal/PrincipalMapperTest.java |   232 -
 .../hostmap/FileBasedHostMapperTest.java        |    64 -
 .../security/impl/CMFKeystoreServiceTest.java   |   162 -
 .../security/impl/CMFMasterServiceTest.java     |    59 -
 .../security/impl/TestCMFMasterService.java     |    37 -
 .../hadoop/gateway/topology/VersionTest.java    |    50 -
 .../dispatch/CappedBufferHttpEntityTest.java    |   854 ++
 .../gateway/dispatch/DefaultDispatchTest.java   |   234 +
 .../PartiallyRepeatableHttpEntityTest.java      |   874 ++
 .../security/principal/PrincipalMapperTest.java |   232 +
 .../hostmap/FileBasedHostMapperTest.java        |    64 +
 .../security/impl/CMFKeystoreServiceTest.java   |   162 +
 .../security/impl/CMFMasterServiceTest.java     |    59 +
 .../security/impl/TestCMFMasterService.java     |    37 +
 .../knox/gateway/topology/VersionTest.java      |    50 +
 .../hostmap/FileBasedHostMapperTest/hostmap.txt |     6 -
 .../hostmap/FileBasedHostMapperTest/hostmap.txt |     6 +
 .../hadoop/gateway/GatewayTestConfig.java       |   610 -
 .../hadoop/gateway/GatewayTestDriver.java       |   347 -
 .../apache/knox/gateway/GatewayTestConfig.java  |   610 +
 .../apache/knox/gateway/GatewayTestDriver.java  |   347 +
 .../hadoop/gateway/SecureClusterTest.java       |   349 -
 .../apache/knox/gateway/SecureClusterTest.java  |   349 +
 .../org/apache/hadoop/gateway/ShellTest.java    |   198 -
 .../java/org/apache/knox/gateway/ShellTest.java |   189 +
 .../ShellTest/InsecureWebHdfsPutGet.groovy      |    39 -
 .../org/apache/hadoop/gateway/ShellTest/README  |    57 -
 .../gateway/ShellTest/WebHdfsPutGet.groovy      |    40 -
 .../ShellTest/InsecureWebHdfsPutGet.groovy      |    39 +
 .../org/apache/knox/gateway/ShellTest/README    |    57 +
 .../knox/gateway/ShellTest/WebHdfsPutGet.groovy |    40 +
 .../gateway/AmbariServiceDefinitionTest.java    |   367 -
 .../hadoop/gateway/GatewayAdminFuncTest.java    |   218 -
 .../gateway/GatewayAdminTopologyFuncTest.java   |   837 --
 .../hadoop/gateway/GatewayAppFuncTest.java      |   688 -
 .../hadoop/gateway/GatewayBasicFuncTest.java    |  4435 -------
 .../hadoop/gateway/GatewayDeployFuncTest.java   |   354 -
 .../hadoop/gateway/GatewayHealthFuncTest.java   |   229 -
 .../GatewayLdapDynamicGroupFuncTest.java        |   329 -
 .../gateway/GatewayLdapGroupFuncTest.java       |   329 -
 .../gateway/GatewayLdapPosixGroupFuncTest.java  |   298 -
 .../gateway/GatewayLocalServiceFuncTest.java    |   222 -
 .../hadoop/gateway/GatewayMultiFuncTest.java    |   459 -
 .../GatewayPortMappingDisableFeatureTest.java   |   252 -
 .../gateway/GatewayPortMappingFailTest.java     |   150 -
 .../gateway/GatewayPortMappingFuncTest.java     |   279 -
 .../hadoop/gateway/GatewaySampleFuncTest.java   |   220 -
 .../hadoop/gateway/GatewaySslFuncTest.java      |   320 -
 .../apache/hadoop/gateway/Knox242FuncTest.java  |   323 -
 .../gateway/KnoxCliLdapFuncTestNegative.java    |   342 -
 .../gateway/KnoxCliLdapFuncTestPositive.java    |   344 -
 .../hadoop/gateway/KnoxCliSysBindTest.java      |   333 -
 .../gateway/OozieServiceDefinitionTest.java     |   211 -
 .../hadoop/gateway/TestJerseyService.java       |    34 -
 .../TestJerseyServiceDeploymentContributor.java |    44 -
 .../TestProviderDeploymentContributor.java      |    46 -
 .../TestServiceDeploymentContributor.java       |    49 -
 .../gateway/TestServiceDispatchFilter.java      |    44 -
 .../org/apache/hadoop/gateway/TestServlet.java  |    32 -
 .../hadoop/gateway/WebHdfsHaFuncTest.java       |   467 -
 .../deploy/DeploymentFactoryFuncTest.java       |   683 -
 .../gateway/AmbariServiceDefinitionTest.java    |   367 +
 .../knox/gateway/GatewayAdminFuncTest.java      |   216 +
 .../gateway/GatewayAdminTopologyFuncTest.java   |   837 ++
 .../apache/knox/gateway/GatewayAppFuncTest.java |   688 +
 .../knox/gateway/GatewayBasicFuncTest.java      |  4434 +++++++
 .../knox/gateway/GatewayDeployFuncTest.java     |   353 +
 .../knox/gateway/GatewayHealthFuncTest.java     |   229 +
 .../GatewayLdapDynamicGroupFuncTest.java        |   323 +
 .../knox/gateway/GatewayLdapGroupFuncTest.java  |   324 +
 .../gateway/GatewayLdapPosixGroupFuncTest.java  |   297 +
 .../gateway/GatewayLocalServiceFuncTest.java    |   224 +
 .../knox/gateway/GatewayMultiFuncTest.java      |   459 +
 .../GatewayPortMappingDisableFeatureTest.java   |   252 +
 .../gateway/GatewayPortMappingFailTest.java     |   150 +
 .../gateway/GatewayPortMappingFuncTest.java     |   276 +
 .../knox/gateway/GatewaySampleFuncTest.java     |   219 +
 .../apache/knox/gateway/GatewaySslFuncTest.java |   319 +
 .../apache/knox/gateway/Knox242FuncTest.java    |   318 +
 .../gateway/KnoxCliLdapFuncTestNegative.java    |   339 +
 .../gateway/KnoxCliLdapFuncTestPositive.java    |   343 +
 .../apache/knox/gateway/KnoxCliSysBindTest.java |   332 +
 .../gateway/OozieServiceDefinitionTest.java     |   212 +
 .../apache/knox/gateway/TestJerseyService.java  |    34 +
 .../TestJerseyServiceDeploymentContributor.java |    45 +
 .../TestProviderDeploymentContributor.java      |    47 +
 .../TestServiceDeploymentContributor.java       |    49 +
 .../knox/gateway/TestServiceDispatchFilter.java |    44 +
 .../org/apache/knox/gateway/TestServlet.java    |    32 +
 .../apache/knox/gateway/WebHdfsHaFuncTest.java  |   466 +
 .../deploy/DeploymentFactoryFuncTest.java       |   683 +
 ...gateway.deploy.ProviderDeploymentContributor |    19 -
 ....gateway.deploy.ServiceDeploymentContributor |    20 -
 ...gateway.deploy.ProviderDeploymentContributor |    19 +
 ....gateway.deploy.ServiceDeploymentContributor |    20 +
 .../clusters-response-expected.json             |    13 -
 .../clusters-response.json                      |    13 -
 .../encrypted-response.txt                      |     1 -
 .../history-server-response-expected.json       |   250 -
 .../history-server-response.json                |   250 -
 .../post-data-wrong-type.json                   |   421 -
 .../test-svcs/readme.txt                        |    18 -
 .../test-topology.xml                           |    34 -
 .../unwise-character-response.json              |   410 -
 .../views-response-expected.json                |   328 -
 .../views-response.json                         |   328 -
 .../test-cluster.xml                            |    82 -
 .../dynamic-app/app.war/WEB-INF/web.xml         |    15 -
 .../GatewayAppFuncTest/test-apps/readme.txt     |    18 -
 .../test-apps/static-hello-app/app/index.html   |    24 -
 .../test-apps/static-json-app/app.dir/one.json  |     3 -
 .../test-apps/static-json-app/rewrite.xml       |    17 -
 .../test-apps/static-json-app/service.xml       |    21 -
 .../test-apps/static-xml-app/app/test.xml       |    17 -
 .../test-default-app-name-topology.xml          |    53 -
 .../test-dynamic-app-topology.xml               |    54 -
 .../test-multi-apps-topology.xml                |    65 -
 .../test-naked-app-topology.xml                 |    33 -
 .../test-static-hello-topology.xml              |    54 -
 .../test-svcs-and-apps-topology.xml             |    62 -
 .../GatewayAppFuncTest/test-svcs/readme.txt     |    18 -
 .../test-svcs/webhdfs/2.4.0/rewrite.xml         |    70 -
 .../test-svcs/webhdfs/2.4.0/service.xml         |    43 -
 .../gateway/GatewayBasicFuncTest/changes.txt    | 11730 -----------------
 .../falcon/cleanseEmailProcess.xml              |    36 -
 .../falcon/cleansedEmailFeed.xml                |    43 -
 .../falcon/config-build.json                    |    32 -
 .../falcon/config-build.xml                     |    31 -
 .../falcon/config-deploy.json                   |     1 -
 .../falcon/config-deploy.xml                    |    11 -
 .../falcon/config-runtime.json                  |    24 -
 .../falcon/config-runtime.xml                   |    23 -
 .../falcon/config-startup.json                  |   188 -
 .../falcon/config-startup.xml                   |   192 -
 .../falcon/emailIngestProcess.xml               |    29 -
 .../falcon/entity-delete-process.json           |     5 -
 .../falcon/entity-dependency-process.xml        |    22 -
 .../falcon/entity-list-cluster.xml              |    11 -
 .../falcon/entity-resume-feed.xml               |     8 -
 .../falcon/entity-schedule-feed.xml             |     8 -
 .../falcon/entity-status-process.xml            |     8 -
 .../falcon/entity-submit-feed.json              |     5 -
 .../falcon/entity-submit-schedule-process.json  |     5 -
 .../falcon/entity-summary-feed.json             |     1 -
 .../falcon/entity-summary-feed.xml              |     5 -
 .../falcon/entity-update-feed.xml               |    10 -
 .../falcon/entity-validate-cluster.xml          |     5 -
 .../falcon/instance-params-process.json         |     1 -
 .../falcon/instance-process-logs.json           |    77 -
 .../falcon/instance-running-process.json        |    13 -
 .../falcon/instance-status-process.json         |     1 -
 .../falcon/metadata-disc-cluster-entity.json    |     1 -
 .../falcon/metadata-disc-cluster-relations.json |   106 -
 .../falcon/metadata-disc-process-entity.json    |     1 -
 .../falcon/metadata-lineage-edges-all.json      |   559 -
 .../falcon/metadata-lineage-edges-id.json       |     1 -
 .../falcon/metadata-lineage-vertices-all.json   |   238 -
 .../metadata-lineage-vertices-direction.json    |    34 -
 .../falcon/metadata-lineage-vertices-id.json    |    10 -
 .../falcon/metadata-lineage-vertices-key.json   |    13 -
 .../falcon/oregonCluster.xml                    |    15 -
 .../falcon/rawEmailFeed.xml                     |    28 -
 .../GatewayBasicFuncTest/falcon/stack.txt       |    40 -
 .../GatewayBasicFuncTest/falcon/version.json    |    16 -
 .../GatewayBasicFuncTest/falcon/version.xml     |    15 -
 .../falcon/virginiaCluster.xml                  |    15 -
 .../hbase/scanner-definition.xml                |    21 -
 .../GatewayBasicFuncTest/hbase/table-data.json  |    21 -
 .../hbase/table-data.protobuf                   |     9 -
 .../GatewayBasicFuncTest/hbase/table-data.xml   |    28 -
 .../GatewayBasicFuncTest/hbase/table-list.json  |    10 -
 .../hbase/table-list.protobuf                   |     3 -
 .../GatewayBasicFuncTest/hbase/table-list.xml   |    26 -
 .../hbase/table-metadata.json                   |    37 -
 .../hbase/table-metadata.protobuf               |     4 -
 .../hbase/table-metadata.xml                    |    28 -
 .../hbase/table-schema.json                     |    11 -
 .../hbase/table-schema.protobuf                 |     4 -
 .../GatewayBasicFuncTest/hbase/table-schema.xml |    22 -
 .../hive/close-operation-1-request.bin          |   Bin 96 -> 0 bytes
 .../hive/close-operation-1-result.bin           |   Bin 42 -> 0 bytes
 .../hive/close-operation-2-request.bin          |   Bin 96 -> 0 bytes
 .../hive/close-operation-2-result.bin           |   Bin 42 -> 0 bytes
 .../hive/close-operation-3-request.bin          |   Bin 96 -> 0 bytes
 .../hive/close-operation-3-result.bin           |   Bin 42 -> 0 bytes
 .../hive/close-operation-4-request.bin          |   Bin 96 -> 0 bytes
 .../hive/close-operation-4-result.bin           |   Bin 42 -> 0 bytes
 .../hive/close-operation-5-request.bin          |   Bin 96 -> 0 bytes
 .../hive/close-operation-5-result.bin           |   Bin 42 -> 0 bytes
 .../hive/close-operation-6-request.bin          |   Bin 96 -> 0 bytes
 .../hive/close-operation-6-result.bin           |   Bin 42 -> 0 bytes
 .../hive/close-session-request.bin              |   Bin 83 -> 0 bytes
 .../hive/close-session-result.bin               |   Bin 40 -> 0 bytes
 .../hive/execute-create-table-request.bin       |   Bin 147 -> 0 bytes
 .../hive/execute-create-table-result.bin        |   Bin 109 -> 0 bytes
 .../hive/execute-select-from-table-request.bin  |   Bin 126 -> 0 bytes
 .../hive/execute-select-from-table-result.bin   |   Bin 109 -> 0 bytes
 .../execute-set-fetch-output-serde-request.bin  |   Bin 183 -> 0 bytes
 .../execute-set-fetch-output-serde-result.bin   |   Bin 109 -> 0 bytes
 ...t-security-authorization-enabled-request.bin |   Bin 148 -> 0 bytes
 ...et-security-authorization-enabled-result.bin |   Bin 109 -> 0 bytes
 .../execute-set-server2-http-path-request.bin   |   Bin 149 -> 0 bytes
 .../execute-set-server2-http-path-result.bin    |   Bin 109 -> 0 bytes
 .../execute-set-server2-servermode-request.bin  |   Bin 136 -> 0 bytes
 .../execute-set-server2-servermode-result.bin   |   Bin 109 -> 0 bytes
 .../hive/fetch-results-request.bin              |   Bin 112 -> 0 bytes
 .../hive/fetch-results-result.bin               |   Bin 67 -> 0 bytes
 .../hive/get-result-set-metadata-request.bin    |   Bin 102 -> 0 bytes
 .../hive/get-result-set-metadata-result.bin     |   Bin 144 -> 0 bytes
 .../hive/open-session-request.bin               |   Bin 35 -> 0 bytes
 .../hive/open-session-result.bin                |   Bin 109 -> 0 bytes
 .../oozie-admin-build-version.json              |     3 -
 .../oozie-admin-configuration.json              |   152 -
 .../oozie-admin-instrumentation.json            |   836 --
 .../oozie-admin-java-sys-properties.json        |    77 -
 .../oozie-admin-os-env.json                     |    43 -
 .../oozie-admin-status.json                     |     3 -
 .../oozie-job-action-rerun-request.xml          |    37 -
 .../oozie-job-show-definition.xml               |    56 -
 .../oozie-job-show-info.json                    |    43 -
 .../GatewayBasicFuncTest/oozie-job-show-log.txt |   134 -
 .../gateway/GatewayBasicFuncTest/oozie-job.json |    43 -
 .../GatewayBasicFuncTest/oozie-jobs-empty.json  |     6 -
 .../GatewayBasicFuncTest/oozie-jobs-sample.json |    27 -
 .../oozie-jobs-submit-request.xml               |    43 -
 .../oozie-jobs-submit-response.json             |     3 -
 .../GatewayBasicFuncTest/oozie-versions.json    |     4 -
 .../GatewayBasicFuncTest/oozie-workflow.xml     |    40 -
 .../gateway/GatewayBasicFuncTest/passwd.txt     |     4 -
 .../gateway/GatewayBasicFuncTest/script.hive    |     1 -
 .../gateway/GatewayBasicFuncTest/script.pig     |     3 -
 .../gateway/GatewayBasicFuncTest/small1.txt     |    18 -
 .../gateway/GatewayBasicFuncTest/small2.txt     |    18 -
 .../storm/cluster-configuration.json            |   141 -
 .../storm/cluster-summary.json                  |    12 -
 .../storm/supervisor-summary.json               |    11 -
 .../storm/topology-component-id.json            |   122 -
 .../GatewayBasicFuncTest/storm/topology-id.json |   284 -
 .../storm/topology-summary.json                 |    15 -
 .../gateway/GatewayBasicFuncTest/test.txt       |     1 -
 .../webhcat-job-status.json                     |     1 -
 .../webhdfs-liststatus-default.json             |     5 -
 .../webhdfs-liststatus-empty.json               |     3 -
 .../webhdfs-liststatus-test.json                |     3 -
 .../GatewayBasicFuncTest/webhdfs-success.json   |     1 -
 .../GatewayBasicFuncTest/yarn/app_running.json  |    25 -
 .../GatewayBasicFuncTest/yarn/app_running.xml   |    40 -
 .../yarn/app_succeeded.json                     |    25 -
 .../GatewayBasicFuncTest/yarn/app_succeeded.xml |    40 -
 .../GatewayBasicFuncTest/yarn/appattempts.json  |    14 -
 .../GatewayBasicFuncTest/yarn/appattempts.xml   |    27 -
 .../yarn/application-killing.json               |     1 -
 .../yarn/application-submit-request.json        |    49 -
 .../gateway/GatewayBasicFuncTest/yarn/apps.json |    73 -
 .../gateway/GatewayBasicFuncTest/yarn/apps.xml  |    86 -
 .../yarn/appstatistics.json                     |    26 -
 .../GatewayBasicFuncTest/yarn/appstatistics.xml |    39 -
 .../GatewayBasicFuncTest/yarn/cluster-info.json |    14 -
 .../GatewayBasicFuncTest/yarn/cluster-info.xml  |    34 -
 .../yarn/cluster-metrics.json                   |    23 -
 .../yarn/cluster-metrics.xml                    |    38 -
 .../yarn/new-application.json                   |     1 -
 .../gateway/GatewayBasicFuncTest/yarn/node.json |    15 -
 .../gateway/GatewayBasicFuncTest/yarn/node.xml  |    30 -
 .../GatewayBasicFuncTest/yarn/nodes.json        |    19 -
 .../gateway/GatewayBasicFuncTest/yarn/nodes.xml |    32 -
 .../yarn/proxy-mapreduce-info.json              |     9 -
 .../yarn/proxy-mapreduce-info.xml               |    24 -
 .../yarn/proxy-mapreduce-job-attempts.json      |    14 -
 .../yarn/proxy-mapreduce-job-attempts.xml       |    27 -
 .../yarn/proxy-mapreduce-job-conf.json          |  5263 --------
 .../yarn/proxy-mapreduce-job-conf.xml           |  4019 ------
 .../yarn/proxy-mapreduce-job-counters.json      |   307 -
 .../yarn/proxy-mapreduce-job-counters.xml       |   313 -
 .../yarn/proxy-mapreduce-job.json               |    33 -
 .../yarn/proxy-mapreduce-job.xml                |    48 -
 .../yarn/proxy-mapreduce-jobs.json              |    37 -
 .../yarn/proxy-mapreduce-jobs.xml               |    50 -
 .../proxy-mapreduce-task-attempt-counters.json  |   155 -
 .../proxy-mapreduce-task-attempt-counters.xml   |   163 -
 .../yarn/proxy-mapreduce-task-attempt.json      |    21 -
 .../yarn/proxy-mapreduce-task-attempt.xml       |    37 -
 .../yarn/proxy-mapreduce-task-attempts.json     |    26 -
 .../yarn/proxy-mapreduce-task-attempts.xml      |    40 -
 .../yarn/proxy-mapreduce-task-counters.json     |   155 -
 .../yarn/proxy-mapreduce-task-counters.xml      |   160 -
 .../yarn/proxy-mapreduce-task.json              |    13 -
 .../yarn/proxy-mapreduce-task.xml               |    28 -
 .../yarn/proxy-mapreduce-tasks.json             |    28 -
 .../yarn/proxy-mapreduce-tasks.xml              |    42 -
 .../GatewayBasicFuncTest/yarn/scheduler.json    |    41 -
 .../GatewayBasicFuncTest/yarn/scheduler.xml     |    53 -
 .../GatewayLdapPosixGroupFuncTest/users.ldif    |   106 -
 .../applications/readme.txt                     |    18 -
 .../GatewayMultiFuncTest/services/readme.txt    |    18 -
 .../services/repeat/0.0.0/rewrite.xml           |    28 -
 .../services/repeat/0.0.0/service.xml           |    23 -
 .../test-knox678-utf8-chars-topology.xml        |    54 -
 ...knox694-principal-regex-search-attribute.xml |    81 -
 ...st-knox694-principal-regex-search-filter.xml |    77 -
 ...x694-principal-regex-search-scope-object.xml |    77 -
 ...pal-regex-search-scope-onelevel-negative.xml |    81 -
 ...pal-regex-search-scope-onelevel-positive.xml |    81 -
 ...knox694-principal-regex-user-dn-template.xml |    65 -
 .../GatewaySslFuncTest/test-admin-topology.xml  |    53 -
 .../oozie-request-relative.xml                  |    14 -
 .../oozie-request-with-complex-var.xml          |    14 -
 .../oozie-request-with-var.xml                  |    14 -
 .../webhdfs-liststatus-standby.json             |     5 -
 .../webhdfs-liststatus-success.json             |    88 -
 .../webhdfs-mkdirs-safemode.json                |     5 -
 .../webhdfs-rename-safemode-off.json            |     1 -
 .../webhdfs-rename-safemode.json                |     5 -
 .../test-apps/minimal-test-app/rewrite.xml      |    17 -
 .../test-apps/minimal-test-app/service.xml      |    21 -
 .../clusters-response-expected.json             |    13 +
 .../clusters-response.json                      |    13 +
 .../encrypted-response.txt                      |     1 +
 .../history-server-response-expected.json       |   250 +
 .../history-server-response.json                |   250 +
 .../post-data-wrong-type.json                   |   421 +
 .../test-svcs/readme.txt                        |    18 +
 .../test-topology.xml                           |    34 +
 .../unwise-character-response.json              |   410 +
 .../views-response-expected.json                |   328 +
 .../views-response.json                         |   328 +
 .../test-cluster.xml                            |    82 +
 .../dynamic-app/app.war/WEB-INF/web.xml         |    15 +
 .../GatewayAppFuncTest/test-apps/readme.txt     |    18 +
 .../test-apps/static-hello-app/app/index.html   |    24 +
 .../test-apps/static-json-app/app.dir/one.json  |     3 +
 .../test-apps/static-json-app/rewrite.xml       |    17 +
 .../test-apps/static-json-app/service.xml       |    21 +
 .../test-apps/static-xml-app/app/test.xml       |    17 +
 .../test-default-app-name-topology.xml          |    53 +
 .../test-dynamic-app-topology.xml               |    54 +
 .../test-multi-apps-topology.xml                |    65 +
 .../test-naked-app-topology.xml                 |    33 +
 .../test-static-hello-topology.xml              |    54 +
 .../test-svcs-and-apps-topology.xml             |    62 +
 .../GatewayAppFuncTest/test-svcs/readme.txt     |    18 +
 .../test-svcs/webhdfs/2.4.0/rewrite.xml         |    70 +
 .../test-svcs/webhdfs/2.4.0/service.xml         |    43 +
 .../gateway/GatewayBasicFuncTest/changes.txt    | 11730 +++++++++++++++++
 .../falcon/cleanseEmailProcess.xml              |    36 +
 .../falcon/cleansedEmailFeed.xml                |    43 +
 .../falcon/config-build.json                    |    32 +
 .../falcon/config-build.xml                     |    31 +
 .../falcon/config-deploy.json                   |     1 +
 .../falcon/config-deploy.xml                    |    11 +
 .../falcon/config-runtime.json                  |    24 +
 .../falcon/config-runtime.xml                   |    23 +
 .../falcon/config-startup.json                  |   188 +
 .../falcon/config-startup.xml                   |   192 +
 .../falcon/emailIngestProcess.xml               |    29 +
 .../falcon/entity-delete-process.json           |     5 +
 .../falcon/entity-dependency-process.xml        |    22 +
 .../falcon/entity-list-cluster.xml              |    11 +
 .../falcon/entity-resume-feed.xml               |     8 +
 .../falcon/entity-schedule-feed.xml             |     8 +
 .../falcon/entity-status-process.xml            |     8 +
 .../falcon/entity-submit-feed.json              |     5 +
 .../falcon/entity-submit-schedule-process.json  |     5 +
 .../falcon/entity-summary-feed.json             |     1 +
 .../falcon/entity-summary-feed.xml              |     5 +
 .../falcon/entity-update-feed.xml               |    10 +
 .../falcon/entity-validate-cluster.xml          |     5 +
 .../falcon/instance-params-process.json         |     1 +
 .../falcon/instance-process-logs.json           |    77 +
 .../falcon/instance-running-process.json        |    13 +
 .../falcon/instance-status-process.json         |     1 +
 .../falcon/metadata-disc-cluster-entity.json    |     1 +
 .../falcon/metadata-disc-cluster-relations.json |   106 +
 .../falcon/metadata-disc-process-entity.json    |     1 +
 .../falcon/metadata-lineage-edges-all.json      |   559 +
 .../falcon/metadata-lineage-edges-id.json       |     1 +
 .../falcon/metadata-lineage-vertices-all.json   |   238 +
 .../metadata-lineage-vertices-direction.json    |    34 +
 .../falcon/metadata-lineage-vertices-id.json    |    10 +
 .../falcon/metadata-lineage-vertices-key.json   |    13 +
 .../falcon/oregonCluster.xml                    |    15 +
 .../falcon/rawEmailFeed.xml                     |    28 +
 .../GatewayBasicFuncTest/falcon/stack.txt       |    40 +
 .../GatewayBasicFuncTest/falcon/version.json    |    16 +
 .../GatewayBasicFuncTest/falcon/version.xml     |    15 +
 .../falcon/virginiaCluster.xml                  |    15 +
 .../hbase/scanner-definition.xml                |    21 +
 .../GatewayBasicFuncTest/hbase/table-data.json  |    21 +
 .../hbase/table-data.protobuf                   |     9 +
 .../GatewayBasicFuncTest/hbase/table-data.xml   |    28 +
 .../GatewayBasicFuncTest/hbase/table-list.json  |    10 +
 .../hbase/table-list.protobuf                   |     3 +
 .../GatewayBasicFuncTest/hbase/table-list.xml   |    26 +
 .../hbase/table-metadata.json                   |    37 +
 .../hbase/table-metadata.protobuf               |     4 +
 .../hbase/table-metadata.xml                    |    28 +
 .../hbase/table-schema.json                     |    11 +
 .../hbase/table-schema.protobuf                 |     4 +
 .../GatewayBasicFuncTest/hbase/table-schema.xml |    22 +
 .../hive/close-operation-1-request.bin          |   Bin 0 -> 96 bytes
 .../hive/close-operation-1-result.bin           |   Bin 0 -> 42 bytes
 .../hive/close-operation-2-request.bin          |   Bin 0 -> 96 bytes
 .../hive/close-operation-2-result.bin           |   Bin 0 -> 42 bytes
 .../hive/close-operation-3-request.bin          |   Bin 0 -> 96 bytes
 .../hive/close-operation-3-result.bin           |   Bin 0 -> 42 bytes
 .../hive/close-operation-4-request.bin          |   Bin 0 -> 96 bytes
 .../hive/close-operation-4-result.bin           |   Bin 0 -> 42 bytes
 .../hive/close-operation-5-request.bin          |   Bin 0 -> 96 bytes
 .../hive/close-operation-5-result.bin           |   Bin 0 -> 42 bytes
 .../hive/close-operation-6-request.bin          |   Bin 0 -> 96 bytes
 .../hive/close-operation-6-result.bin           |   Bin 0 -> 42 bytes
 .../hive/close-session-request.bin              |   Bin 0 -> 83 bytes
 .../hive/close-session-result.bin               |   Bin 0 -> 40 bytes
 .../hive/execute-create-table-request.bin       |   Bin 0 -> 147 bytes
 .../hive/execute-create-table-result.bin        |   Bin 0 -> 109 bytes
 .../hive/execute-select-from-table-request.bin  |   Bin 0 -> 126 bytes
 .../hive/execute-select-from-table-result.bin   |   Bin 0 -> 109 bytes
 .../execute-set-fetch-output-serde-request.bin  |   Bin 0 -> 183 bytes
 .../execute-set-fetch-output-serde-result.bin   |   Bin 0 -> 109 bytes
 ...t-security-authorization-enabled-request.bin |   Bin 0 -> 148 bytes
 ...et-security-authorization-enabled-result.bin |   Bin 0 -> 109 bytes
 .../execute-set-server2-http-path-request.bin   |   Bin 0 -> 149 bytes
 .../execute-set-server2-http-path-result.bin    |   Bin 0 -> 109 bytes
 .../execute-set-server2-servermode-request.bin  |   Bin 0 -> 136 bytes
 .../execute-set-server2-servermode-result.bin   |   Bin 0 -> 109 bytes
 .../hive/fetch-results-request.bin              |   Bin 0 -> 112 bytes
 .../hive/fetch-results-result.bin               |   Bin 0 -> 67 bytes
 .../hive/get-result-set-metadata-request.bin    |   Bin 0 -> 102 bytes
 .../hive/get-result-set-metadata-result.bin     |   Bin 0 -> 144 bytes
 .../hive/open-session-request.bin               |   Bin 0 -> 35 bytes
 .../hive/open-session-result.bin                |   Bin 0 -> 109 bytes
 .../oozie-admin-build-version.json              |     3 +
 .../oozie-admin-configuration.json              |   152 +
 .../oozie-admin-instrumentation.json            |   836 ++
 .../oozie-admin-java-sys-properties.json        |    77 +
 .../oozie-admin-os-env.json                     |    43 +
 .../oozie-admin-status.json                     |     3 +
 .../oozie-job-action-rerun-request.xml          |    37 +
 .../oozie-job-show-definition.xml               |    56 +
 .../oozie-job-show-info.json                    |    43 +
 .../GatewayBasicFuncTest/oozie-job-show-log.txt |   134 +
 .../gateway/GatewayBasicFuncTest/oozie-job.json |    43 +
 .../GatewayBasicFuncTest/oozie-jobs-empty.json  |     6 +
 .../GatewayBasicFuncTest/oozie-jobs-sample.json |    27 +
 .../oozie-jobs-submit-request.xml               |    43 +
 .../oozie-jobs-submit-response.json             |     3 +
 .../GatewayBasicFuncTest/oozie-versions.json    |     4 +
 .../GatewayBasicFuncTest/oozie-workflow.xml     |    40 +
 .../gateway/GatewayBasicFuncTest/passwd.txt     |     4 +
 .../gateway/GatewayBasicFuncTest/script.hive    |     1 +
 .../gateway/GatewayBasicFuncTest/script.pig     |     3 +
 .../gateway/GatewayBasicFuncTest/small1.txt     |    18 +
 .../gateway/GatewayBasicFuncTest/small2.txt     |    18 +
 .../storm/cluster-configuration.json            |   141 +
 .../storm/cluster-summary.json                  |    12 +
 .../storm/supervisor-summary.json               |    11 +
 .../storm/topology-component-id.json            |   122 +
 .../GatewayBasicFuncTest/storm/topology-id.json |   284 +
 .../storm/topology-summary.json                 |    15 +
 .../knox/gateway/GatewayBasicFuncTest/test.txt  |     1 +
 .../webhcat-job-status.json                     |     1 +
 .../webhdfs-liststatus-default.json             |     5 +
 .../webhdfs-liststatus-empty.json               |     3 +
 .../webhdfs-liststatus-test.json                |     3 +
 .../GatewayBasicFuncTest/webhdfs-success.json   |     1 +
 .../GatewayBasicFuncTest/yarn/app_running.json  |    25 +
 .../GatewayBasicFuncTest/yarn/app_running.xml   |    40 +
 .../yarn/app_succeeded.json                     |    25 +
 .../GatewayBasicFuncTest/yarn/app_succeeded.xml |    40 +
 .../GatewayBasicFuncTest/yarn/appattempts.json  |    14 +
 .../GatewayBasicFuncTest/yarn/appattempts.xml   |    27 +
 .../yarn/application-killing.json               |     1 +
 .../yarn/application-submit-request.json        |    49 +
 .../gateway/GatewayBasicFuncTest/yarn/apps.json |    73 +
 .../gateway/GatewayBasicFuncTest/yarn/apps.xml  |    86 +
 .../yarn/appstatistics.json                     |    26 +
 .../GatewayBasicFuncTest/yarn/appstatistics.xml |    39 +
 .../GatewayBasicFuncTest/yarn/cluster-info.json |    14 +
 .../GatewayBasicFuncTest/yarn/cluster-info.xml  |    34 +
 .../yarn/cluster-metrics.json                   |    23 +
 .../yarn/cluster-metrics.xml                    |    38 +
 .../yarn/new-application.json                   |     1 +
 .../gateway/GatewayBasicFuncTest/yarn/node.json |    15 +
 .../gateway/GatewayBasicFuncTest/yarn/node.xml  |    30 +
 .../GatewayBasicFuncTest/yarn/nodes.json        |    19 +
 .../gateway/GatewayBasicFuncTest/yarn/nodes.xml |    32 +
 .../yarn/proxy-mapreduce-info.json              |     9 +
 .../yarn/proxy-mapreduce-info.xml               |    24 +
 .../yarn/proxy-mapreduce-job-attempts.json      |    14 +
 .../yarn/proxy-mapreduce-job-attempts.xml       |    27 +
 .../yarn/proxy-mapreduce-job-conf.json          |  5263 ++++++++
 .../yarn/proxy-mapreduce-job-conf.xml           |  4019 ++++++
 .../yarn/proxy-mapreduce-job-counters.json      |   307 +
 .../yarn/proxy-mapreduce-job-counters.xml       |   313 +
 .../yarn/proxy-mapreduce-job.json               |    33 +
 .../yarn/proxy-mapreduce-job.xml                |    48 +
 .../yarn/proxy-mapreduce-jobs.json              |    37 +
 .../yarn/proxy-mapreduce-jobs.xml               |    50 +
 .../proxy-mapreduce-task-attempt-counters.json  |   155 +
 .../proxy-mapreduce-task-attempt-counters.xml   |   163 +
 .../yarn/proxy-mapreduce-task-attempt.json      |    21 +
 .../yarn/proxy-mapreduce-task-attempt.xml       |    37 +
 .../yarn/proxy-mapreduce-task-attempts.json     |    26 +
 .../yarn/proxy-mapreduce-task-attempts.xml      |    40 +
 .../yarn/proxy-mapreduce-task-counters.json     |   155 +
 .../yarn/proxy-mapreduce-task-counters.xml      |   160 +
 .../yarn/proxy-mapreduce-task.json              |    13 +
 .../yarn/proxy-mapreduce-task.xml               |    28 +
 .../yarn/proxy-mapreduce-tasks.json             |    28 +
 .../yarn/proxy-mapreduce-tasks.xml              |    42 +
 .../GatewayBasicFuncTest/yarn/scheduler.json    |    41 +
 .../GatewayBasicFuncTest/yarn/scheduler.xml     |    53 +
 .../GatewayLdapPosixGroupFuncTest/users.ldif    |   106 +
 .../applications/readme.txt                     |    18 +
 .../GatewayMultiFuncTest/services/readme.txt    |    18 +
 .../services/repeat/0.0.0/rewrite.xml           |    28 +
 .../services/repeat/0.0.0/service.xml           |    23 +
 .../test-knox678-utf8-chars-topology.xml        |    54 +
 ...knox694-principal-regex-search-attribute.xml |    81 +
 ...st-knox694-principal-regex-search-filter.xml |    77 +
 ...x694-principal-regex-search-scope-object.xml |    77 +
 ...pal-regex-search-scope-onelevel-negative.xml |    81 +
 ...pal-regex-search-scope-onelevel-positive.xml |    81 +
 ...knox694-principal-regex-user-dn-template.xml |    65 +
 .../GatewaySslFuncTest/test-admin-topology.xml  |    53 +
 .../oozie-request-relative.xml                  |    14 +
 .../oozie-request-with-complex-var.xml          |    14 +
 .../oozie-request-with-var.xml                  |    14 +
 .../webhdfs-liststatus-standby.json             |     5 +
 .../webhdfs-liststatus-success.json             |    88 +
 .../webhdfs-mkdirs-safemode.json                |     5 +
 .../webhdfs-rename-safemode-off.json            |     1 +
 .../webhdfs-rename-safemode.json                |     5 +
 .../test-apps/minimal-test-app/rewrite.xml      |    17 +
 .../test-apps/minimal-test-app/service.xml      |    21 +
 .../apache/hadoop/gateway/audit/api/Action.java |    34 -
 .../hadoop/gateway/audit/api/ActionOutcome.java |    36 -
 .../hadoop/gateway/audit/api/AuditContext.java  |    51 -
 .../hadoop/gateway/audit/api/AuditService.java  |    77 -
 .../gateway/audit/api/AuditServiceFactory.java  |    43 -
 .../hadoop/gateway/audit/api/Auditor.java       |    86 -
 .../gateway/audit/api/CorrelationContext.java   |    74 -
 .../gateway/audit/api/CorrelationService.java   |    99 -
 .../audit/api/CorrelationServiceFactory.java    |    44 -
 .../hadoop/gateway/audit/api/ResourceType.java  |    28 -
 .../gateway/audit/log4j/appender/JdbmQueue.java |   176 -
 .../appender/JdbmStoreAndForwardAppender.java   |   123 -
 .../audit/log4j/audit/AuditConstants.java       |    35 -
 .../audit/log4j/audit/Log4jAuditContext.java    |   113 -
 .../audit/log4j/audit/Log4jAuditService.java    |    84 -
 .../gateway/audit/log4j/audit/Log4jAuditor.java |   111 -
 .../correlation/Log4jCorrelationContext.java    |   105 -
 .../correlation/Log4jCorrelationService.java    |   128 -
 .../gateway/audit/log4j/layout/AuditLayout.java |    79 -
 .../gateway/i18n/GatewayUtilCommonMessages.java |    36 -
 .../SynchronousServletInputStreamAdapter.java   |    39 -
 .../SynchronousServletOutputStreamAdapter.java  |    34 -
 .../hadoop/gateway/util/CertificateUtils.java   |    65 -
 .../apache/hadoop/gateway/util/HttpUtils.java   |   123 -
 .../hadoop/gateway/util/IpAddressValidator.java |   116 -
 .../apache/hadoop/gateway/util/JsonPath.java    |   386 -
 .../apache/hadoop/gateway/util/JsonUtils.java   |    70 -
 .../apache/hadoop/gateway/util/MimeTypeMap.java |   110 -
 .../apache/hadoop/gateway/util/MimeTypes.java   |    78 -
 .../apache/hadoop/gateway/util/RegExUtils.java  |    43 -
 .../org/apache/hadoop/gateway/util/Urls.java    |   176 -
 .../gateway/util/X500PrincipalParser.java       |   189 -
 .../apache/hadoop/gateway/util/XmlUtils.java    |   107 -
 .../apache/knox/gateway/audit/api/Action.java   |    34 +
 .../knox/gateway/audit/api/ActionOutcome.java   |    36 +
 .../knox/gateway/audit/api/AuditContext.java    |    51 +
 .../knox/gateway/audit/api/AuditService.java    |    77 +
 .../gateway/audit/api/AuditServiceFactory.java  |    43 +
 .../apache/knox/gateway/audit/api/Auditor.java  |    86 +
 .../gateway/audit/api/CorrelationContext.java   |    74 +
 .../gateway/audit/api/CorrelationService.java   |    99 +
 .../audit/api/CorrelationServiceFactory.java    |    44 +
 .../knox/gateway/audit/api/ResourceType.java    |    28 +
 .../gateway/audit/log4j/appender/JdbmQueue.java |   176 +
 .../appender/JdbmStoreAndForwardAppender.java   |   123 +
 .../audit/log4j/audit/AuditConstants.java       |    35 +
 .../audit/log4j/audit/Log4jAuditContext.java    |   113 +
 .../audit/log4j/audit/Log4jAuditService.java    |    84 +
 .../gateway/audit/log4j/audit/Log4jAuditor.java |   111 +
 .../correlation/Log4jCorrelationContext.java    |   105 +
 .../correlation/Log4jCorrelationService.java    |   128 +
 .../gateway/audit/log4j/layout/AuditLayout.java |    79 +
 .../gateway/i18n/GatewayUtilCommonMessages.java |    36 +
 .../SynchronousServletInputStreamAdapter.java   |    39 +
 .../SynchronousServletOutputStreamAdapter.java  |    34 +
 .../knox/gateway/util/CertificateUtils.java     |    65 +
 .../org/apache/knox/gateway/util/HttpUtils.java |   123 +
 .../knox/gateway/util/IpAddressValidator.java   |   116 +
 .../org/apache/knox/gateway/util/JsonPath.java  |   386 +
 .../org/apache/knox/gateway/util/JsonUtils.java |    70 +
 .../apache/knox/gateway/util/MimeTypeMap.java   |   110 +
 .../org/apache/knox/gateway/util/MimeTypes.java |    78 +
 .../apache/knox/gateway/util/RegExUtils.java    |    43 +
 .../java/org/apache/knox/gateway/util/Urls.java |   176 +
 .../knox/gateway/util/X500PrincipalParser.java  |   189 +
 .../org/apache/knox/gateway/util/XmlUtils.java  |   107 +
 .../hadoop/gateway/audit/AuditLayoutTest.java   |   156 -
 .../hadoop/gateway/audit/AuditServiceTest.java  |   187 -
 .../hadoop/gateway/audit/JdbmQueueTest.java     |   297 -
 .../audit/StoreAndForwardAppenderTest.java      |    71 -
 .../hadoop/gateway/util/HttpUtilsTest.java      |   213 -
 .../gateway/util/IpAddressValidatorTest.java    |    78 -
 .../hadoop/gateway/util/JsonPathTest.java       |   580 -
 .../hadoop/gateway/util/JsonUtilsTest.java      |    57 -
 .../hadoop/gateway/util/MimeTypeMapTest.java    |    52 -
 .../apache/hadoop/gateway/util/UrlsTest.java    |    98 -
 .../knox/gateway/audit/AuditLayoutTest.java     |   157 +
 .../knox/gateway/audit/AuditServiceTest.java    |   187 +
 .../knox/gateway/audit/JdbmQueueTest.java       |   296 +
 .../audit/StoreAndForwardAppenderTest.java      |    71 +
 .../apache/knox/gateway/util/HttpUtilsTest.java |   213 +
 .../gateway/util/IpAddressValidatorTest.java    |    78 +
 .../apache/knox/gateway/util/JsonPathTest.java  |   580 +
 .../apache/knox/gateway/util/JsonUtilsTest.java |    57 +
 .../knox/gateway/util/MimeTypeMapTest.java      |    52 +
 .../org/apache/knox/gateway/util/UrlsTest.java  |    98 +
 .../src/test/resources/audit-log4j.properties   |     2 +-
 .../org/apache/hadoop/gateway/config/Alias.java |    31 -
 .../gateway/config/ConfigurationAdapter.java    |    24 -
 .../gateway/config/ConfigurationBinding.java    |    24 -
 .../gateway/config/ConfigurationException.java  |    30 -
 .../config/ConfigurationInjectorBuilder.java    |   107 -
 .../apache/hadoop/gateway/config/Configure.java |    30 -
 .../apache/hadoop/gateway/config/Default.java   |    31 -
 .../apache/hadoop/gateway/config/Optional.java  |    30 -
 .../config/impl/BeanConfigurationAdapter.java   |    40 -
 .../BeanConfigurationAdapterDescriptor.java     |    30 -
 .../impl/ConfigurationAdapterFactory.java       |   132 -
 .../impl/DefaultConfigurationBinding.java       |    29 -
 .../impl/DefaultConfigurationInjector.java      |   229 -
 .../config/impl/MapConfigurationAdapter.java    |    37 -
 .../impl/MapConfigurationAdapterDescriptor.java |    30 -
 .../config/impl/MappedConfigurationBinding.java |    38 -
 .../impl/PropertiesConfigurationAdapter.java    |    38 -
 ...ropertiesConfigurationAdapterDescriptor.java |    30 -
 .../AbstractConfigurationAdapterDescriptor.java |    42 -
 .../spi/ConfigurationAdapterDescriptor.java     |    28 -
 .../config/spi/ConfigurationInjector.java       |    27 -
 .../org/apache/knox/gateway/config/Alias.java   |    31 +
 .../gateway/config/ConfigurationAdapter.java    |    24 +
 .../gateway/config/ConfigurationBinding.java    |    24 +
 .../gateway/config/ConfigurationException.java  |    30 +
 .../config/ConfigurationInjectorBuilder.java    |   107 +
 .../apache/knox/gateway/config/Configure.java   |    30 +
 .../org/apache/knox/gateway/config/Default.java |    31 +
 .../apache/knox/gateway/config/Optional.java    |    30 +
 .../config/impl/BeanConfigurationAdapter.java   |    40 +
 .../BeanConfigurationAdapterDescriptor.java     |    29 +
 .../impl/ConfigurationAdapterFactory.java       |   132 +
 .../impl/DefaultConfigurationBinding.java       |    29 +
 .../impl/DefaultConfigurationInjector.java      |   235 +
 .../config/impl/MapConfigurationAdapter.java    |    37 +
 .../impl/MapConfigurationAdapterDescriptor.java |    31 +
 .../config/impl/MappedConfigurationBinding.java |    38 +
 .../impl/PropertiesConfigurationAdapter.java    |    38 +
 ...ropertiesConfigurationAdapterDescriptor.java |    31 +
 .../AbstractConfigurationAdapterDescriptor.java |    42 +
 .../spi/ConfigurationAdapterDescriptor.java     |    28 +
 .../config/spi/ConfigurationInjector.java       |    27 +
 ...ay.config.spi.ConfigurationAdapterDescriptor |    20 -
 ...oop.gateway.config.spi.ConfigurationInjector |    18 -
 ...ay.config.spi.ConfigurationAdapterDescriptor |    20 +
 ...nox.gateway.config.spi.ConfigurationInjector |    18 +
 .../gateway/config/AdapterSampleTest.java       |    57 -
 .../apache/hadoop/gateway/config/FuncTest.java  |   379 -
 .../gateway/config/MapFieldSampleTest.java      |    45 -
 .../gateway/config/MapMethodSampleTest.java     |    49 -
 .../hadoop/gateway/config/OptionalTest.java     |    59 -
 .../config/PropertiesFactorySampleTest.java     |    40 -
 .../config/PropertiesFieldSampleTest.java       |    39 -
 .../config/PropertiesMethodSampleTest.java      |    57 -
 .../apache/hadoop/gateway/config/UsageTest.java |    43 -
 .../BeanConfigurationAdapterDescriptorTest.java |    57 -
 .../impl/BeanConfigurationAdapterTest.java      |    40 -
 .../knox/gateway/config/AdapterSampleTest.java  |    57 +
 .../apache/knox/gateway/config/FuncTest.java    |   378 +
 .../knox/gateway/config/MapFieldSampleTest.java |    45 +
 .../gateway/config/MapMethodSampleTest.java     |    49 +
 .../knox/gateway/config/OptionalTest.java       |    58 +
 .../config/PropertiesFactorySampleTest.java     |    39 +
 .../config/PropertiesFieldSampleTest.java       |    39 +
 .../config/PropertiesMethodSampleTest.java      |    57 +
 .../apache/knox/gateway/config/UsageTest.java   |    43 +
 .../BeanConfigurationAdapterDescriptorTest.java |    57 +
 .../impl/BeanConfigurationAdapterTest.java      |    40 +
 .../apache/hadoop/gateway/launcher/Command.java |   156 -
 .../apache/hadoop/gateway/launcher/Config.java  |   149 -
 .../apache/hadoop/gateway/launcher/Forker.java  |    32 -
 .../apache/hadoop/gateway/launcher/Invoker.java |    92 -
 .../hadoop/gateway/launcher/Launcher.java       |   174 -
 .../hadoop/gateway/launcher/Streamer.java       |    52 -
 .../apache/knox/gateway/launcher/Command.java   |   156 +
 .../apache/knox/gateway/launcher/Config.java    |   149 +
 .../apache/knox/gateway/launcher/Forker.java    |    32 +
 .../apache/knox/gateway/launcher/Invoker.java   |    92 +
 .../apache/knox/gateway/launcher/Launcher.java  |   174 +
 .../apache/knox/gateway/launcher/Streamer.java  |    52 +
 .../hadoop/gateway/launcher/ConfigTest.java     |   116 -
 .../knox/gateway/launcher/ConfigTest.java       |   116 +
 .../gateway/util/urltemplate/Builder.java       |   402 -
 .../gateway/util/urltemplate/Evaluator.java     |    26 -
 .../gateway/util/urltemplate/Expander.java      |   320 -
 .../gateway/util/urltemplate/Fragment.java      |    34 -
 .../gateway/util/urltemplate/Function.java      |   114 -
 .../hadoop/gateway/util/urltemplate/Host.java   |    34 -
 .../gateway/util/urltemplate/Matcher.java       |   521 -
 .../gateway/util/urltemplate/Messages.java      |    22 -
 .../gateway/util/urltemplate/MockParams.java    |    58 -
 .../hadoop/gateway/util/urltemplate/Params.java |    26 -
 .../hadoop/gateway/util/urltemplate/Parser.java |   345 -
 .../gateway/util/urltemplate/Password.java      |    34 -
 .../hadoop/gateway/util/urltemplate/Path.java   |    34 -
 .../hadoop/gateway/util/urltemplate/Port.java   |    34 -
 .../hadoop/gateway/util/urltemplate/Query.java  |    53 -
 .../gateway/util/urltemplate/Resolver.java      |    26 -
 .../gateway/util/urltemplate/Resources.java     |    28 -
 .../gateway/util/urltemplate/Rewriter.java      |   102 -
 .../hadoop/gateway/util/urltemplate/Scheme.java |    34 -
 .../gateway/util/urltemplate/Segment.java       |   374 -
 .../gateway/util/urltemplate/Template.java      |   345 -
 .../hadoop/gateway/util/urltemplate/Token.java  |    55 -
 .../gateway/util/urltemplate/Username.java      |    34 -
 .../knox/gateway/util/urltemplate/Builder.java  |   402 +
 .../gateway/util/urltemplate/Evaluator.java     |    26 +
 .../knox/gateway/util/urltemplate/Expander.java |   320 +
 .../knox/gateway/util/urltemplate/Fragment.java |    34 +
 .../knox/gateway/util/urltemplate/Function.java |   114 +
 .../knox/gateway/util/urltemplate/Host.java     |    34 +
 .../knox/gateway/util/urltemplate/Matcher.java  |   521 +
 .../knox/gateway/util/urltemplate/Messages.java |    22 +
 .../gateway/util/urltemplate/MockParams.java    |    58 +
 .../knox/gateway/util/urltemplate/Params.java   |    26 +
 .../knox/gateway/util/urltemplate/Parser.java   |   345 +
 .../knox/gateway/util/urltemplate/Password.java |    34 +
 .../knox/gateway/util/urltemplate/Path.java     |    34 +
 .../knox/gateway/util/urltemplate/Port.java     |    34 +
 .../knox/gateway/util/urltemplate/Query.java    |    53 +
 .../knox/gateway/util/urltemplate/Resolver.java |    26 +
 .../gateway/util/urltemplate/Resources.java     |    28 +
 .../knox/gateway/util/urltemplate/Rewriter.java |   102 +
 .../knox/gateway/util/urltemplate/Scheme.java   |    34 +
 .../knox/gateway/util/urltemplate/Segment.java  |   374 +
 .../knox/gateway/util/urltemplate/Template.java |   345 +
 .../knox/gateway/util/urltemplate/Token.java    |    55 +
 .../knox/gateway/util/urltemplate/Username.java |    34 +
 .../gateway/util/urltemplate/ExpanderTest.java  |   538 -
 .../gateway/util/urltemplate/FunctionTest.java  |   167 -
 .../gateway/util/urltemplate/MatcherTest.java   |  1008 --
 .../util/urltemplate/MatcherTest.java.orig      |   839 --
 .../gateway/util/urltemplate/ParserTest.java    |  1305 --
 .../gateway/util/urltemplate/RewriterTest.java  |   422 -
 .../gateway/util/urltemplate/SegmentTest.java   |   145 -
 .../gateway/util/urltemplate/TemplateTest.java  |   177 -
 .../gateway/util/urltemplate/TokenTest.java     |    42 -
 .../gateway/util/urltemplate/ExpanderTest.java  |   538 +
 .../gateway/util/urltemplate/FunctionTest.java  |   167 +
 .../gateway/util/urltemplate/MatcherTest.java   |  1008 ++
 .../util/urltemplate/MatcherTest.java.orig      |   839 ++
 .../gateway/util/urltemplate/ParserTest.java    |  1305 ++
 .../gateway/util/urltemplate/RewriterTest.java  |   421 +
 .../gateway/util/urltemplate/SegmentTest.java   |   145 +
 .../gateway/util/urltemplate/TemplateTest.java  |   176 +
 .../gateway/util/urltemplate/TokenTest.java     |    42 +
 .../org/apache/hadoop/examples/WordCount.java   |    84 -
 .../org/apache/knox/examples/WordCount.java     |    84 +
 knox-cli-launcher/pom.xml                       |     2 +-
 2584 files changed, 147117 insertions(+), 147140 deletions(-)
----------------------------------------------------------------------