You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2012/12/18 20:42:19 UTC
git commit: FLUME-1784. JMSource fix minor documentation problem and
parameter name
Updated Branches:
refs/heads/trunk 9040e49c0 -> e320842da
FLUME-1784. JMSource fix minor documentation problem and parameter name
(Brock Noland via Hari Shreedharan)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/e320842d
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/e320842d
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/e320842d
Branch: refs/heads/trunk
Commit: e320842da6d99bfe770045b4c44db284bd260fca
Parents: 9040e49
Author: Hari Shreedharan <hs...@apache.org>
Authored: Tue Dec 18 11:40:55 2012 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Tue Dec 18 11:42:12 2012 -0800
----------------------------------------------------------------------
flume-ng-doc/sphinx/FlumeUserGuide.rst | 6 +++---
.../org/apache/flume/source/jms/JMSSource.java | 6 +++---
.../flume/source/jms/JMSSourceConfiguration.java | 6 ++++--
.../org/apache/flume/source/jms/TestJMSSource.java | 8 ++++----
4 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/e320842d/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index 6490710..9507413 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -732,7 +732,7 @@ messageSelector -- Message selector to use when creating t
userName -- Username for the destination/provider
passwordFile -- File containing the password for the destination/provider
batchSize 100 Number of messages to consume in one batch
-converter DEFAULT Class to use to convert messages to flume events. See below.
+converter.type DEFAULT Class to use to convert messages to flume events. See below.
converter.* -- Converter properties.
converter.charset UTF-8 Default converter only. Charset to use when converting JMS TextMessages to byte arrays.
========================= =========== ==============================================================
@@ -750,8 +750,8 @@ BytesMessage:
of data per message.
TextMessage:
- Text of message is converted to a UTF-8 byte array and copied to the body of the
- FlumeEvent.
+ Text of message is converted to a byte array and copied to the body of the
+ FlumeEvent. The default converter uses UTF-8 by default but this is configurable.
ObjectMessage:
Object is written out to a ByteArrayOutputStream wrapped in an ObjectOutputStream and
http://git-wip-us.apache.org/repos/asf/flume/blob/e320842d/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSource.java b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSource.java
index e18b879..6ebb2bb 100644
--- a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSource.java
+++ b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSource.java
@@ -132,10 +132,10 @@ public class JMSSource extends AbstractPollableSource {
}
String converterClassName = context.getString(
- JMSSourceConfiguration.CONVERTER,
- JMSSourceConfiguration.CONVERTER_DEFAULT)
+ JMSSourceConfiguration.CONVERTER_TYPE,
+ JMSSourceConfiguration.CONVERTER_TYPE_DEFAULT)
.trim();
- if(JMSSourceConfiguration.CONVERTER_DEFAULT.
+ if(JMSSourceConfiguration.CONVERTER_TYPE_DEFAULT.
equalsIgnoreCase(converterClassName)) {
converterClassName = DefaultJMSMessageConverter.Builder.class.getName();
}
http://git-wip-us.apache.org/repos/asf/flume/blob/e320842d/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSourceConfiguration.java
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSourceConfiguration.java b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSourceConfiguration.java
index 8a311c3..c0ec9b6 100644
--- a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSourceConfiguration.java
+++ b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSSourceConfiguration.java
@@ -48,9 +48,11 @@ public class JMSSourceConfiguration {
public static final long POLL_TIMEOUT_DEFAULT = 1000L;
public static final String CONVERTER = "converter";
- public static final String CONVERTER_DEFAULT = "DEFAULT";
- public static final String CONVERTER_CHARSET = CONVERTER + ".converter";
+ public static final String CONVERTER_TYPE = CONVERTER + ".type";
+ public static final String CONVERTER_TYPE_DEFAULT = "DEFAULT";
+
+ public static final String CONVERTER_CHARSET = CONVERTER + ".charset";
public static final String CONVERTER_CHARSET_DEFAULT = "UTF-8";
}
http://git-wip-us.apache.org/repos/asf/flume/blob/e320842d/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
----------------------------------------------------------------------
diff --git a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
index 617393c..ddfd767 100644
--- a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
+++ b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSSource.java
@@ -193,7 +193,7 @@ public class TestJMSSource extends JMSMessageConsumerTestBase {
}
@Test(expected = FlumeException.class)
public void testConfigureWithInvalidConverterClass() throws Exception {
- context.put(JMSSourceConfiguration.CONVERTER, "not a valid classname");
+ context.put(JMSSourceConfiguration.CONVERTER_TYPE, "not a valid classname");
source.configure(context);
}
@Test
@@ -208,7 +208,7 @@ public class TestJMSSource extends JMSMessageConsumerTestBase {
@Test
public void testNonDefaultConverter() throws Exception {
// tests that a classname can be specified
- context.put(JMSSourceConfiguration.CONVERTER,
+ context.put(JMSSourceConfiguration.CONVERTER_TYPE,
DefaultJMSMessageConverter.Builder.class.getName());
source.configure(context);
source.start();
@@ -238,7 +238,7 @@ public class TestJMSSource extends JMSMessageConsumerTestBase {
@Test
public void testNonBuilderConfigurableConverter() throws Exception {
// tests that a non builder by configurable converter works
- context.put(JMSSourceConfiguration.CONVERTER,
+ context.put(JMSSourceConfiguration.CONVERTER_TYPE,
NonBuilderConfigurableConverter.class.getName());
source.configure(context);
source.start();
@@ -250,7 +250,7 @@ public class TestJMSSource extends JMSMessageConsumerTestBase {
@Test
public void testNonBuilderNonConfigurableConverter() throws Exception {
// tests that a non builder non configurable converter
- context.put(JMSSourceConfiguration.CONVERTER,
+ context.put(JMSSourceConfiguration.CONVERTER_TYPE,
NonBuilderNonConfigurableConverter.class.getName());
source.configure(context);
source.start();