Updated Branches: refs/heads/trunk 31ca65cc0 -> 8f77db07c
FLUME-1554. FileChannel fails to build on machines with old protocol buffer compiler. (Brock Noland via Mike Percy) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/8f77db07 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/8f77db07 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/8f77db07 Branch: refs/heads/trunk Commit: 8f77db07ca58941bd64e40ad06d7d57ba4c79f01 Parents: 31ca65c Author: Mike Percy <[email protected]> Authored: Tue Sep 11 19:24:07 2012 -0700 Committer: Mike Percy <[email protected]> Committed: Tue Sep 11 19:24:07 2012 -0700 ---------------------------------------------------------------------- flume-ng-channels/flume-file-channel/pom.xml | 118 +- .../java/org/apache/flume/channel/file/Commit.java | 2 +- .../channel/file/EventQueueBackingStoreFileV3.java | 2 +- .../org/apache/flume/channel/file/LogFileV3.java | 2 +- .../java/org/apache/flume/channel/file/Put.java | 2 +- .../org/apache/flume/channel/file/Rollback.java | 2 +- .../java/org/apache/flume/channel/file/Take.java | 2 +- .../flume/channel/file/TransactionEventRecord.java | 2 +- .../flume/channel/file/proto/ProtosFactory.java | 6053 +++++++++++++++ .../src/main/proto/filechannel.proto | 2 +- 10 files changed, 6114 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml index 639195e..658c06f 100644 --- a/flume-ng-channels/flume-file-channel/pom.xml +++ b/flume-ng-channels/flume-file-channel/pom.xml @@ -37,71 +37,6 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-sources/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <configuration> - <skipTests>false</skipTests> - </configuration> - <executions> - <execution> - <id>compile-proto</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <echo file="target/compile-proto.sh"> - PROTO_DIR=src/main/proto - JAVA_DIR=target/generated-sources/java - which cygpath 2> /dev/null - if [ $? = 1 ]; then - IS_WIN=false - else - IS_WIN=true - WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR` - WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR` - fi - mkdir -p $JAVA_DIR 2> /dev/null - for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` - do - if [ "$IS_WIN" = "true" ]; then - protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE - else - protoc -I$PROTO_DIR --java_out=$JAVA_DIR $PROTO_FILE - fi - done - </echo> - <exec executable="sh" dir="${basedir}" failonerror="true"> - <arg line="target/compile-proto.sh"/> - </exec> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> @@ -194,6 +129,59 @@ </dependencies> </profile> + + <profile> + <id>compile-proto</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <configuration> + <skipTests>false</skipTests> + </configuration> + <executions> + <execution> + <id>compile-proto</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo file="target/compile-proto.sh"> + PROTO_DIR=src/main/proto + JAVA_DIR=src/main/java + which cygpath 2> /dev/null + if [ $? = 1 ]; then + IS_WIN=false + else + IS_WIN=true + WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR` + WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR` + fi + mkdir -p $JAVA_DIR 2> /dev/null + for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null` + do + if [ "$IS_WIN" = "true" ]; then + protoc -I$WIN_PROTO_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE + else + protoc -I$PROTO_DIR --java_out=$JAVA_DIR $PROTO_FILE + fi + done + </echo> + <exec executable="sh" dir="${basedir}" failonerror="true"> + <arg line="target/compile-proto.sh"/> + </exec> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Commit.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Commit.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Commit.java index 7d57bb8..62f4451 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Commit.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Commit.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; /** * Represents a Commit on disk http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFileV3.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFileV3.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFileV3.java index c766d09..c24f89f 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFileV3.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/EventQueueBackingStoreFileV3.java @@ -26,7 +26,7 @@ import java.io.RandomAccessFile; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java index 414d6d9..ddd1744 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/LogFileV3.java @@ -28,7 +28,7 @@ import java.security.Key; import javax.annotation.Nullable; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; import org.apache.flume.channel.file.encryption.CipherProvider; import org.apache.flume.channel.file.encryption.CipherProviderFactory; import org.apache.flume.channel.file.encryption.KeyProvider; http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Put.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Put.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Put.java index 884ebde..d47b1c8 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Put.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Put.java @@ -25,7 +25,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Map; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Rollback.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Rollback.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Rollback.java index 1a8ddff..cc9ce86 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Rollback.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Rollback.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; /** * Represents a Rollback on disk http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Take.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Take.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Take.java index cfbe0c9..e61bf7e 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Take.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/Take.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; /** * Represents a Take on disk http://git-wip-us.apache.org/repos/asf/flume/blob/8f77db07/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java index f78147f..70098a0 100644 --- a/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java +++ b/flume-ng-channels/flume-file-channel/src/main/java/org/apache/flume/channel/file/TransactionEventRecord.java @@ -29,7 +29,7 @@ import java.io.OutputStream; import java.lang.reflect.Constructor; import java.nio.ByteBuffer; -import org.apache.flume.chanel.file.proto.ProtosFactory; +import org.apache.flume.channel.file.proto.ProtosFactory; import org.apache.hadoop.io.Writable; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
