You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ar...@apache.org on 2012/02/01 18:26:16 UTC
svn commit: r1239218 - in /incubator/flume/branches/flume-728:
flume-ng-core/src/main/java/org/apache/flume/channel/
flume-ng-core/src/test/java/org/apache/flume/channel/
flume-ng-node/src/main/java/org/apache/flume/conf/file/
flume-ng-node/src/test/ja...
Author: arvind
Date: Wed Feb 1 17:26:15 2012
New Revision: 1239218
URL: http://svn.apache.org/viewvc?rev=1239218&view=rev
Log:
FLUME-940. Removing unused code from Flume.
Removed:
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/channel/FanoutChannel.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/channel/TestFanoutChannel.java
incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/conf/file/JsonFileConfigurationProvider.java
incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/conf/file/TestJsonFileConfigurationProvider.java
Modified:
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelType.java
incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/conf/properties/TestPropertiesFileConfigurationProvider.java
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelType.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelType.java?rev=1239218&r1=1239217&r2=1239218&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelType.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/channel/ChannelType.java Wed Feb 1 17:26:15 2012
@@ -35,12 +35,6 @@ public enum ChannelType {
MEMORY(MemoryChannel.class.getName()),
/**
- * Fan-out channel
- * @see FanoutChannel
- */
- FAN_OUT(FanoutChannel.class.getName()),
-
- /**
* JDBC channel provided by org.apache.flume.channel.jdbc.JdbcChannel
*/
JDBC("org.apache.flume.channel.jdbc.JdbcChannel");
Modified: incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/conf/properties/TestPropertiesFileConfigurationProvider.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/conf/properties/TestPropertiesFileConfigurationProvider.java?rev=1239218&r1=1239217&r2=1239218&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/conf/properties/TestPropertiesFileConfigurationProvider.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/conf/properties/TestPropertiesFileConfigurationProvider.java Wed Feb 1 17:26:15 2012
@@ -20,7 +20,6 @@ package org.apache.flume.conf.properties
import java.io.File;
import org.apache.flume.channel.DefaultChannelFactory;
-import org.apache.flume.conf.file.TestJsonFileConfigurationProvider;
import org.apache.flume.sink.DefaultSinkFactory;
import org.apache.flume.source.DefaultSourceFactory;
import org.junit.Test;
@@ -30,7 +29,7 @@ import org.slf4j.LoggerFactory;
public class TestPropertiesFileConfigurationProvider {
private static final File TESTFILE = new File(
- TestJsonFileConfigurationProvider.class.getClassLoader()
+ TestPropertiesFileConfigurationProvider.class.getClassLoader()
.getResource("flume-conf.properties").getFile());
private static final Logger LOGGER = LoggerFactory