This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git.
from ce6db54 FLUME-3389 Build and test Apache Flume on ARM64 CPU
architecture
add 2b4d546 FLUME-3335 - Support configuration via HTTP(S)
add c48877d Merge pull request #347 from apache/FLUME-3335
No new revisions were added by this update.
Summary of changes:
flume-ng-doc/sphinx/FlumeUserGuide.rst | 99 ++++++++-
flume-ng-node/pom.xml | 24 ++-
.../flume/node/AbstractConfigurationProvider.java | 3 +
.../java/org/apache/flume/node/Application.java | 237 ++++++++++++++++-----
.../flume/node/ClasspathConfigurationSource.java | 71 ++++++
.../node/ClasspathConfigurationSourceFactory.java | 41 ++++
.../org/apache/flume/node/ConfigurationSource.java | 56 +++++
.../flume/node/ConfigurationSourceFactory.java | 50 +++++
.../flume/node/EnvVarResolverProperties.java | 5 +
.../apache/flume/node/FileConfigurationSource.java | 110 ++++++++++
.../flume/node/FileConfigurationSourceFactory.java | 42 ++++
.../apache/flume/node/HttpConfigurationSource.java | 150 +++++++++++++
.../flume/node/HttpConfigurationSourceFactory.java | 42 ++++
.../java/org/apache/flume/node/MapResolver.java | 70 ++++++
.../flume/node/MaterializedConfiguration.java | 12 +-
...PollingPropertiesFileConfigurationProvider.java | 143 +------------
.../node/PropertiesFileConfigurationProvider.java | 58 +----
...Provider.java => UriConfigurationProvider.java} | 237 ++++++++++++++++-----
.../flume/node/net/AuthorizationProvider.java | 27 +++
.../flume/node/net/BasicAuthorizationProvider.java | 45 ++++
.../apache/flume/node/net/LaxHostnameVerifier.java | 38 ++++
.../flume/node/net/UrlConnectionFactory.java | 104 +++++++++
...rg.apache.flume.node.ConfigurationSourceFactory | 17 ++
.../node/TestClasspathConfigurationSource.java | 73 +++++++
...rResolverProperties.java => TestEnvLookup.java} | 43 ++--
.../flume/node/TestHttpConfigurationSource.java | 141 ++++++++++++
...solverProperties.java => TestOverrideFile.java} | 51 ++---
...PollingPropertiesFileConfigurationProvider.java | 8 +-
.../TestPropertiesFileConfigurationProvider.java | 8 +-
...verProperties.java => TestRecursiveLookup.java} | 47 ++--
...perties.2786 => flume-conf-override.properties} | 18 +-
...erties => flume-conf-with-envLookup.properties} | 2 +-
... => flume-conf-with-recursiveLookup.properties} | 6 +-
pom.xml | 33 ++-
34 files changed, 1690 insertions(+), 421 deletions(-)
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/ClasspathConfigurationSource.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/ClasspathConfigurationSourceFactory.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/ConfigurationSource.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/ConfigurationSourceFactory.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/FileConfigurationSource.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/FileConfigurationSourceFactory.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSource.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/HttpConfigurationSourceFactory.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/MapResolver.java
copy
flume-ng-node/src/main/java/org/apache/flume/node/{PropertiesFileConfigurationProvider.java
=> UriConfigurationProvider.java} (52%)
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/net/AuthorizationProvider.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/net/BasicAuthorizationProvider.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/net/LaxHostnameVerifier.java
create mode 100644
flume-ng-node/src/main/java/org/apache/flume/node/net/UrlConnectionFactory.java
create mode 100644
flume-ng-node/src/main/resources/META-INF/services/org.apache.flume.node.ConfigurationSourceFactory
create mode 100644
flume-ng-node/src/test/java/org/apache/flume/node/TestClasspathConfigurationSource.java
copy
flume-ng-node/src/test/java/org/apache/flume/node/{TestEnvVarResolverProperties.java
=> TestEnvLookup.java} (58%)
create mode 100644
flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
copy
flume-ng-node/src/test/java/org/apache/flume/node/{TestEnvVarResolverProperties.java
=> TestOverrideFile.java} (51%)
copy
flume-ng-node/src/test/java/org/apache/flume/node/{TestEnvVarResolverProperties.java
=> TestRecursiveLookup.java} (51%)
copy flume-ng-node/src/test/resources/{flume-conf.properties.2786 =>
flume-conf-override.properties} (67%)
mode change 100755 => 100644
copy flume-ng-node/src/test/resources/{flume-conf-with-envvars.properties =>
flume-conf-with-envLookup.properties} (97%)
copy flume-ng-node/src/test/resources/{flume-conf-with-envvars.properties =>
flume-conf-with-recursiveLookup.properties} (90%)
