You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by es...@apache.org on 2011/11/01 20:05:01 UTC
svn commit: r1196214 - in /incubator/flume/branches/flume-728/flume-ng-core:
pom.xml src/test/java/org/apache/flume/source/TestExecSource.java
Author: esammer
Date: Tue Nov 1 19:05:01 2011
New Revision: 1196214
URL: http://svn.apache.org/viewvc?rev=1196214&view=rev
Log:
FLUME-825: Need to remove dependency on hadoop core from flume-ng-core project
Modified:
incubator/flume/branches/flume-728/flume-ng-core/pom.xml
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java
Modified: incubator/flume/branches/flume-728/flume-ng-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/pom.xml?rev=1196214&r1=1196213&r2=1196214&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/pom.xml (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/pom.xml Tue Nov 1 19:05:01 2011
@@ -113,10 +113,9 @@
<scope>test</scope>
</dependency>
- <!-- FIXME: There should be no dependency on Hadoop in Flume core. -->
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</dependency>
<dependency>
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java?rev=1196214&r1=1196213&r2=1196214&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/source/TestExecSource.java Tue Nov 1 19:05:01 2011
@@ -1,7 +1,6 @@
package org.apache.flume.source;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -10,12 +9,10 @@ import org.apache.flume.Channel;
import org.apache.flume.Context;
import org.apache.flume.Event;
import org.apache.flume.EventDeliveryException;
-import org.apache.flume.EventDrivenSource;
import org.apache.flume.Transaction;
import org.apache.flume.channel.MemoryChannel;
import org.apache.flume.conf.Configurables;
import org.apache.flume.lifecycle.LifecycleException;
-import org.apache.hadoop.fs.FileUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -43,25 +40,31 @@ public class TestExecSource {
source.setChannel(channel);
source.start();
Transaction transaction = channel.getTransaction();
-
+
transaction.begin();
Event event;
int numEvents = 0;
-
- FileOutputStream outputStream = new FileOutputStream("/tmp/flume-execsource." + Thread.currentThread().getId());
+
+ FileOutputStream outputStream = new FileOutputStream(
+ "/tmp/flume-execsource." + Thread.currentThread().getId());
+
while ((event = channel.take()) != null) {
outputStream.write(event.getBody());
outputStream.write('\n');
- numEvents ++;
+ numEvents++;
}
+
outputStream.close();
transaction.commit();
transaction.close();
-
+
source.stop();
- File file1 = new File("/tmp/flume-execsource." + Thread.currentThread().getId());
+
+ File file1 = new File("/tmp/flume-execsource."
+ + Thread.currentThread().getId());
File file2 = new File("/etc/passwd");
- Assert.assertEquals(FileUtils.checksumCRC32(file1), FileUtils.checksumCRC32(file2));
+ Assert.assertEquals(FileUtils.checksumCRC32(file1),
+ FileUtils.checksumCRC32(file2));
FileUtils.forceDelete(file1);
}