Updated Branches: refs/heads/flume-1.4 747d614f8 -> 352729ba7
FLUME-1869: Request to add 'HTTP' source type to SourceType.java (Hari Shreedharan via Brock Noland) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/352729ba Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/352729ba Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/352729ba Branch: refs/heads/flume-1.4 Commit: 352729ba740cd293fa5515cfc974e40dbea72bd4 Parents: 747d614 Author: Brock Noland <[email protected]> Authored: Wed Jan 23 16:04:16 2013 -0600 Committer: Brock Noland <[email protected]> Committed: Wed Jan 23 16:04:47 2013 -0600 ---------------------------------------------------------------------- .../flume/conf/source/SourceConfiguration.java | 11 +++++++++-- .../org/apache/flume/conf/source/SourceType.java | 9 ++++++++- flume-ng-doc/sphinx/FlumeUserGuide.rst | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/352729ba/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java index 9728bfd..51514e6 100644 --- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java +++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java @@ -175,7 +175,7 @@ public class SourceConfiguration extends ComponentConfiguration { * Multiport Syslog TCP Source * * @see org.apache.flume.source.MultiportSyslogTCPSource - * + * */ MULTIPORT_SYSLOGTCP("org.apache.flume.source.MultiportSyslogTCPSourceConfiguration"), @@ -185,7 +185,14 @@ public class SourceConfiguration extends ComponentConfiguration { * * @see org.apache.flume.source.SpoolDirectorySource */ - SPOOLDIR("org.apache.flume.conf.source.SpoolDirectorySourceConfiguration"); + SPOOLDIR("org.apache.flume.conf.source.SpoolDirectorySourceConfiguration"), + + /** + * HTTP Source + * + * @see org.apache.flume.source.http.HTTPSource + */ + HTTP("org.apache.flume.source.http.HTTPSourceConfiguration"); private String srcConfigurationName; http://git-wip-us.apache.org/repos/asf/flume/blob/352729ba/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceType.java ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceType.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceType.java index 5dbdd1d..058ca1c 100644 --- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceType.java +++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceType.java @@ -82,7 +82,14 @@ public enum SourceType { * * @see org.apache.flume.source.SpoolDirectorySource */ - SPOOLDIR("org.apache.flume.source.SpoolDirectorySource"); + SPOOLDIR("org.apache.flume.source.SpoolDirectorySource"), + + /** + * HTTP Source + * + * @see org.apache.flume.source.http.HTTPSource + */ + HTTP("org.apache.flume.source.http.HTTPSource"); private final String sourceClassName; http://git-wip-us.apache.org/repos/asf/flume/blob/352729ba/flume-ng-doc/sphinx/FlumeUserGuide.rst ---------------------------------------------------------------------- diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index aa92974..eb490ad 100644 --- a/flume-ng-doc/sphinx/FlumeUserGuide.rst +++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst @@ -1016,7 +1016,7 @@ inserted into the channel in one transaction. ============== =========================================== ==================================================================== Property Name Default Description ============== =========================================== ==================================================================== -**type** The FQCN of this class: ``org.apache.flume.source.http.HTTPSource`` +**type** The component type name, needs to be ``http`` **port** -- The port the source should bind to. handler ``org.apache.flume.http.JSONHandler`` The FQCN of the handler class. handler.* -- Config parameters for the handler
