Return-Path: X-Original-To: apmail-incubator-flume-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-flume-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3BDF9C7F for ; Mon, 18 Jun 2012 08:22:01 +0000 (UTC) Received: (qmail 52462 invoked by uid 500); 18 Jun 2012 08:22:01 -0000 Delivered-To: apmail-incubator-flume-commits-archive@incubator.apache.org Received: (qmail 52206 invoked by uid 500); 18 Jun 2012 08:22:01 -0000 Mailing-List: contact flume-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flume-dev@incubator.apache.org Delivered-To: mailing list flume-commits@incubator.apache.org Received: (qmail 52005 invoked by uid 99); 18 Jun 2012 08:22:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jun 2012 08:22:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jun 2012 08:21:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A45552388C29; Mon, 18 Jun 2012 08:21:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1351228 [1/4] - in /incubator/flume/branches/flume-1262: ./ flume-ng-channels/flume-file-channel/src/site/ flume-ng-channels/flume-jdbc-channel/src/site/ flume-ng-channels/flume-recoverable-memory-channel/src/site/ flume-ng-channels/src/ f... Date: Mon, 18 Jun 2012 08:21:21 -0000 To: flume-commits@incubator.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120618082123.A45552388C29@eris.apache.org> Author: rgoers Date: Mon Jun 18 08:21:19 2012 New Revision: 1351228 URL: http://svn.apache.org/viewvc?rev=1351228&view=rev Log: Use normal Maven site build Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/ incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/ incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/ incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-channels/src/ incubator/flume/branches/flume-1262/flume-ng-channels/src/site/ incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/ incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-clients/src/ incubator/flume/branches/flume-1262/flume-ng-clients/src/site/ incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/ incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-core/src/site/ incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-node/src/site/ incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/ incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml incubator/flume/branches/flume-1262/flume-ng-sinks/src/ incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/ incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml incubator/flume/branches/flume-1262/src/site/ incubator/flume/branches/flume-1262/src/site/apt/ incubator/flume/branches/flume-1262/src/site/apt/download.apt incubator/flume/branches/flume-1262/src/site/resources/ incubator/flume/branches/flume-1262/src/site/resources/images/ incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png (with props) incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png (with props) incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png (with props) incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png (with props) incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png (with props) incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png (with props) incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png (with props) incubator/flume/branches/flume-1262/src/site/site.xml incubator/flume/branches/flume-1262/src/site/xdoc/ incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml incubator/flume/branches/flume-1262/src/site/xdoc/index.xml incubator/flume/branches/flume-1262/src/site/xdoc/legacySources.xml incubator/flume/branches/flume-1262/src/site/xdoc/sinks.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/ incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/components.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/configuration.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/log4jappender.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/monitoring.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/overview.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/security.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/setup.xml incubator/flume/branches/flume-1262/src/site/xdoc/usersGuide/troubleshoot.xml Removed: incubator/flume/branches/flume-1262/flume-ng-doc/ Modified: incubator/flume/branches/flume-1262/pom.xml Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-channels/flume-file-channel/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-channels/flume-jdbc-channel/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-channels/flume-recoverable-memory-channel/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-channels/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-clients/flume-ng-log4jappender/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-clients/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-configuration/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-core/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-avro-source/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/flume-thrift-source/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume? + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-legacy-sources/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-node/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-sdk/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-hdfs-sink/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-irc-sink/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-sinks/flume-ng-hbase-sink/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume + ../../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/flume-ng-sinks/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,32 @@ + + + + + Apache Flume? + ../images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + \ No newline at end of file Modified: incubator/flume/branches/flume-1262/pom.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/pom.xml?rev=1351228&r1=1351227&r2=1351228&view=diff ============================================================================== --- incubator/flume/branches/flume-1262/pom.xml (original) +++ incubator/flume/branches/flume-1262/pom.xml Mon Jun 18 08:21:19 2012 @@ -30,6 +30,7 @@ limitations under the License. 1.2.0-incubating-SNAPSHOT pom Apache Flume + http://flume.apache.org/ @@ -39,7 +40,7 @@ limitations under the License. $ **/Test*.java file://people.apache.org/www/incubator.apache.org/flume - ${project.basedir}/target/docs + @@ -48,11 +49,13 @@ limitations under the License. flume-ng-configuration flume-ng-sinks flume-ng-node - flume-ng-dist flume-ng-channels flume-ng-legacy-sources flume-ng-clients flume-ng-sdk + + flume-ng-dist flume-ng-tests @@ -145,17 +148,53 @@ limitations under the License. maven-site-plugin + + + + + + apache-release + + + + maven-javadoc-plugin + 2.8.1 - attach-descriptor + javadoc-jar + package - attach-descriptor + aggregate + + + true + + + + org.apache.flume:* + + + + + + + maven-assembly-plugin + + + source-release-assembly + + true + + @@ -232,6 +271,12 @@ limitations under the License. Bruce Mitchener - + + rgoers@apache.org + rgoers@apache.org + Ralph Goers + Intuit + @@ -380,37 +425,6 @@ limitations under the License. - - - - org.apache.rat - apache-rat-plugin - - - - maven-javadoc-plugin - 2.8.1 - - - javadoc-jar - package - - aggregate - - - - true - - - - org.apache.flume:* - - - - - - - @@ -443,39 +457,6 @@ limitations under the License. - org.apache.rat - apache-rat-plugin - 0.7 - - - test.rat - test - - check - - - - .git/ - .gitignore - - .repository/ - **/*.diff - **/*.patch - **/*.avsc - **/docs/** - - - - - - - - org.tomdz.maven - sphinx-maven-plugin - 1.0.2 - - - org.apache.maven.plugins maven-assembly-plugin 2.2.2 @@ -500,29 +481,17 @@ limitations under the License. org.apache.maven.plugins + maven-release-plugin + 2.2.2 + + + + org.apache.maven.plugins maven-site-plugin 3.1 - ${project.basedir}/flume-ng-doc + - - - - - flume-site - package - - site - - - - flume-site-dist - package - - stage - - - @@ -701,78 +670,78 @@ limitations under the License. org.apache.flume flume-ng-configuration - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume flume-ng-core - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume flume-ng-node - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-channels flume-file-channel - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-channels flume-jdbc-channel - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-channels flume-recoverable-memory-channel - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-sinks flume-hdfs-sink - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-sinks flume-irc-sink - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-sinks flume-ng-hbase-sink - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-legacy-sources flume-thrift-source - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-legacy-sources flume-avro-source - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume flume-ng-sdk - 1.2.0-incubating-SNAPSHOT + ${project.version} org.apache.flume.flume-ng-clients flume-ng-log4jappender - 1.2.0-incubating-SNAPSHOT + ${project.version} @@ -812,31 +781,44 @@ limitations under the License. + index + summary + modules + license project-team - mailing-list + scm issue-tracking - license - cim - scm ---> + plugin-management - org.tomdz.maven - sphinx-maven-plugin - false + org.apache.rat + apache-rat-plugin + 0.8 - ${project.basedir}/flume-ng-doc/sphinx + + .idea/**/* + **/*.iml + .git/ + .gitignore + + .repository/ + **/*.diff + **/*.patch + **/*.avsc + **/docs/** + - - + Added: incubator/flume/branches/flume-1262/src/site/apt/download.apt URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/apt/download.apt?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/apt/download.apt (added) +++ incubator/flume/branches/flume-1262/src/site/apt/download.apt Mon Jun 18 08:21:19 2012 @@ -0,0 +1,60 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one or more +~~ contributor license agreements. See the NOTICE file distributed with +~~ this work for additional information regarding copyright ownership. +~~ The ASF licenses this file to You under the Apache License, Version 2.0 +~~ (the "License"); you may not use this file except in compliance with +~~ the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. + ------ +Download Flume 1.2.0 + ------ + ------ + ------ + +Download Apache Flume 1.2.0 + + Apache Flume 1.2.0 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}. + + The link in the Mirrors column should display a list of available mirrors with a + default selection based on your inferred location. If you do not see that page, + try a different browser. The checksum and signature are links to + the originals on the main distribution server. + +*-------------------------+---------+----------+-----------+ +| | Mirrors | Checksum | Signature | +*-------------------------+---------+----------+-----------+ +| Apache Flume 1.2.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/flume/1.2.0/flume-1.2.0.tar.gz} flume-1.2.0.tar.gz}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.tar.gz.md5} flume-1.2.0.tar.gz.md5}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.tar.gz.asc} flume-1.2.0.tar.gz.asc}} | +*-------------------------+---------+----------+-----------+ +| Apache Flume 1.2.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/flume/1.2.0/flumej-1.2.0.zip} flume-1.2.0.zip}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.zip.md5} flume-1.2.0.zip.md5}} | {{{http://www.apache.org/dist/flume/1.2.0/flume-1.2.0.zip.asc} flume-1.2.0.zip.asc}} | +*-------------------------+---------+----------+-----------+ + + It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. + Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}} for more + information on why you should verify our releases. + + The PGP signatures can be verified using PGP or GPG. First download the {{{http://www.apache.org/dist/logging/KEYS}KEYS}} + as well as the asc signature file for the relevant distribution. Make sure you get these files from the + {{{http://www.apache.org/dist/logging/}main distribution directory}}, rather than from a mirror. Then verify the signatures using + +--- +% gpg --import KEYS +% gpg --verify flume-1.2.0.tar.gz.asc +--- + + Apache Flume 1.2.0 is signed by Joe Flume 1234CAFE + + Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included + in many unix distributions. + + + +* Previous Releases + + All previous releases of Apache log4j can be found in the {{{http://archive.apache.org/dist/logging/log4j}archive repository}}. Added: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image00.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/DevGuide_image01.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image00.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image01.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image02.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/UserGuide_image03.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png?rev=1351228&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/flume/branches/flume-1262/src/site/resources/images/flume-logo.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/flume/branches/flume-1262/src/site/site.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/site.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/site.xml (added) +++ incubator/flume/branches/flume-1262/src/site/site.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,92 @@ + + + + + org.apache.maven.skins + maven-fluido-skin + 1.2.1 + + + + + false + true + true + + + + + + Apache Flume + images/flume-logo.png + http://flume.apache.org/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml (added) +++ incubator/flume/branches/flume-1262/src/site/xdoc/channels.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,38 @@ + + + + + + Apache Flume Channels + Ralph Goers + + + +
+ +

+ Flume is a distributed, reliable, and available system for efficiently + collecting, aggregating, and moving large amounts of log data from many + different sources to a centralized data store. +

+ + +
+ + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml (added) +++ incubator/flume/branches/flume-1262/src/site/xdoc/clients.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,38 @@ + + + + + + Apache Flume Clients + Ralph Goers + + + +
+ +

+ Flume is a distributed, reliable, and available system for efficiently + collecting, aggregating, and moving large amounts of log data from many + different sources to a centralized data store. +

+ + +
+ + + \ No newline at end of file Added: incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml (added) +++ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/building.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,73 @@ + + + + Flume 1.x Developer Guide + + +
+ + + + +

Getting the source

+

Check out the code using Subversion. Click here for + the SVN repository root. +

+

The Flume 1.x development happens under the branch "trunk" so this command line + can be used: +

+ 
svn checkout http://svn.apache.org/repos/asf/incubator/flume/trunk flume-trunk
+

Alternatively, if you prefer using Git, you may use:

+ 
git clone git://git.apache.org/flume.git
+          cd flume
+          git checkout trunk
+
+ +

Compile/test Flume

+

The Flume build is mavenized. You can compile Flume using the standard Maven + commands: +

+
    +
  1. +

    Compile only: + mvn clean compile +

    +
    2. +
  2. +

    Compile and run unit tests: + mvn clean test +

    +
    3. +
  3. +

    Run individual test(s): + mvn clean test -Dtest=<Test1>,<Test2>,... -DfailIfNoTests=false +

    +
    4. +
  4. +

    Create tarball package: + mvn clean install +

    +
    5. +
  5. +

    Create tarball package (skip unit tests): + mvn clean install -DskipTests +

    +
    6. +
+ +
+ + \ No newline at end of file Added: incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml (added) +++ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/custom.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,295 @@ + + + + Flume 1.x Developer Guide + + +
+ + + + +

Client

+

The client operates at the point of origin of events and delivers them to a + Flume agent. Clients typically operate in the process space of the application + they are consuming data from. Currently flume supports Avro, log4j and syslog + as ways to transfer data from remote source. Additionally there’s an Exec + source that can consume the output of a local process as input to Flume. +

+

It’s quite possible to have a use case where these existing options are not + sufficient. In this case you can build a custom mechanism to send data to + Flume. There are two ways of achieving this. First is to create a custom client + that communicates to one of the flume’s existing sources like Avro or syslog. + Here the client should convert it’s data into messages understood by these + Flume sources. The other option is to write a custom Flume source that directly + talks to your existing client application using some IPC or RPC protocols, and + then convert the data into flume events to send it upstream. +

+ +
Client SDK
+

Though flume contains a number of built in mechanisms to ingest data, often one + wants the ability to communicate with flume directly from a custom application. + The Client SDK is a library that enables applications to connect to Flume and + send data into Flume’s data flow over RPC. +

+ +
RPC Client interface
+

The is an interface to wrap the user data data and attributes into an + Event, which is Flume’s unit of flow. This encapsulates the RPC mechanism + supported by Flume. The application can simply call + append() + or + appendBatch() + to send data and not worry about the underlying message + exchanges. +

+ +
Avro RPC Client
+

As of Flume 1.1.0, Avro is the only support RPC protocol. The + NettyAvroRpcClient + implements the + RpcClient + interface. The client needs + to create this object with the host and port of the Flume agent and use it to + send data into flume. The following example shows how to use the Client SDK + API: +

+ + import org.apache.flume.Event; + import org.apache.flume.EventDeliveryException; + import org.apache.flume.FlumeException; + import org.apache.flume.api.RpcClient; + import org.apache.flume.api.RpcClientFactory; + import org.apache.flume.event.EventBuilder; + + public void myInit () { + // setup the RPC connection to Flume agent at hostname/port + RpcClient rpcClient = RpcClientFactory.getDefaultInstance(hostname, port); + ... + } + + public void sendDataToFlume(String data) { + // Create flume event object + Event event = EventBuilder.withBody(data, Charset.forName("UTF-8")); + try { + rpcClient.append(event); + } catch (EventDeliveryException e) { + // clean up and recreate rpcClient + rpcClient.close(); + rpcClient = null; + rpcClient = RpcClientFactory.getDefaultInstance(hostname, port); + } + ... + } + + public void cleanUp () { + // close the rpc connection + rpcClient.close(); + ... + } + + +
Failover handler
+

This class wraps the Avro RPC client to provide failover handling capability to + clients. This takes a list of host/ports of the Flume agent. If there’s an + error in communicating the current agent, then it automatically falls back to + the next agent in the list: +

+ + // Setup properties for the failover + Properties props = new Properties(); + props.put("client.type", "default_failover"); + + // list of hosts + props.put("hosts", "host1 host2 host3"); + + // address/port pair for each host + props.put("hosts.host1", host1 + ":" + port1); + props.put("hosts.host1", host2 + ":" + port2); + props.put("hosts.host1", host3 + ":" + port3); + + // create the client with failover properties + client = (FailoverRpcClient); + RpcClientFactory.getInstance(props); + + +

Transaction interface

+

The + Transaction + interface is the basis of reliability for Flume. All the + major components ie. sources, sinks and channels needs to interface with Flume + transaction. +

+ Transaction sequence diagram +

The transaction interface is implemented by a channel implementation. The + source and sink connected to channel obtain a transaction object. The sources + actually use a channel selector interface that encapsulate the transaction + (discussed in later sections). The operations to stage or extract an event is + done inside an active transaction. For example: +

+ + Channel ch = ... + Transaction tx = ch.getTransaction(); + try { + tx.begin(); + ... + // ch.put(event) or ch.take() + ... + tx.commit(); + } catch (ChannelException ex) { + tx.rollback(); + ... + } finally { + tx.close(); + } + +

Here we get hold of a transaction from a channel. After the begin method is + executed, the event is put in the channel and transaction is committed. +

+ +

Sink

+

The purpose of a sink to extract events from the channel and forward it to the + next Agent in the flow or store in an external repository. A sink is linked to + a channel instance as per the flow configuration. There’s a sink runner thread + that’s get created for every configured sink which manages the sink’s + lifecycle. The sink needs to implement + start() + and + stop() + methods that + are part of the + LifecycleAware + interface. The + start() + method should + initialize the sink and bring it to a state where it can forward the events to + its next destination. The + process() + method from the + Sink + interface + should do the core processing of extracting the event from channel and + forwarding it. The + stop() + method should do the necessary cleanup. The sink + also needs to implement a + Configurable + interface for processing its own + configuration settings: +

+ + // foo sink + public class FooSink extends AbstractSink implements Configurable { + @Override + public void configure(Context context) { + some_Param = context.get("some_param", String.class); + // process some_param … + } + @Override + public void start() { + // initialize the connection to foo repository .. + } + @Override + public void stop () { + // cleanup and disconnect from foo repository .. + } + @Override + public Status process() throws EventDeliveryException { + // Start transaction + ch = getChannel(); + tx = ch.getTransaction(); + try { + tx.begin(); + Event e = ch.take(); + // send the event to foo + // foo.some_operation(e); + tx.commit(); + sgtatus = Status.READY; + (ChannelException e) { + tx.rollback(); + status = Status.BACKOFF; + } finally { + tx.close(); + } + return status; + } + } + } + + + +

Source

+

The purpose of a Source is to receive data from an external client and store it + in the channel. As mentioned above, for sources the + Transaction + interface + is encapsulated by theChannelSelector. Similar toSinkRunner, there’s + a + SourceRunner + thread that gets created for every configured source that + manages the source’s lifecycle. The source needs to implement + start() + and + stop() + methods that are part of the + LifecycleAware + interface. There are + two types of sources, pollable and event-driven. The runner of pollable source + runner invokes a + process() + method from the pollable source. The + process() + method should check for new data and store it in the channel. The + event driver source needs have its own callback mechanism that captures the new + data: +

+ + // bar source + public class BarSource extends AbstractSource implements Configurable, EventDrivenSource{ + @Override + public void configure(Context context) { + some_Param = context.get("some_param", String.class); + // process some_param … + } + @Override + public void start() { + // initialize the connection to bar client .. + } + @Override + public void stop () { + // cleanup and disconnect from bar client .. + } + @Override + public Status process() throws EventDeliveryException { + try { + // receive new data + Event e = get_some_data(); + // store the event to underlying channels(s) + getChannelProcessor().processEvent(e) + } catch (ChannelException ex) { + return Status.BACKOFF; + } + return Status.READY; + } + } + + +

Channel

+

TBD

+ +
+ + \ No newline at end of file Added: incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml (added) +++ incubator/flume/branches/flume-1262/src/site/xdoc/devGuide/overview.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,74 @@ + + + + Flume 1.x Developer Guide + + +
+

Introduction

+ + + +

Apache Flume is a distributed, reliable, and available system for + efficiently collecting, aggregating and moving large amounts of log + data from many different sources to a centralized data store. +

+

At the moment Flume is an incubating Apache project. There are + currently two release code lines available, version 0.9.x and 1.x.x. This guide + is specific to 1.x (more specifically 1.1.0 release). Please click here for + the Flume 0.9.x Developer Guide. +

+ + + + +

Data flow model

+

A unit of data flow is called event which is a byte payload that is accompanied + by an optional set of string attributes. Flume agent is a process (JVM) that + hosts the components that flows events from an external source to next + destination. +

+ Agent component diagram +

A source consumes events delivered to it by an external source like web server + in a specific format. For example, an Avro source can be used to receive Avro + events from clients or other agents in the flow. When a source receives an + event, it stores it into one or more channels. The channel is a passive store + that keeps the event until its consumed by a sink. An example of channel is + the JDBC channel that uses a file-system backed embedded database. The sink + removes the event from channel and puts it into an external repository like + HDFS or forwards it to the source in next hop of the flow. The source and sink + within the given agent run asynchronously with the events staged in the + channel. +

+ +

Reliability

+

The events are staged in the channel on each agent. Then they are delivered to + the next agent or terminal repository (like HDFS) in the flow. The events are + removed from the channel only after they are stored in the channel of next + agent or in the terminal repository. This is a how the single-hop message + delivery semantics in Flume provide end-to-end reliability of the flowFlume + uses transactional approach to guarantee the reliable delivery of the events. + The sources and sinks encapsulate the store/retrieval of the events in a + transaction provided by the channel. This ensures that the set of events are + reliably passed from point to point in the flow. In case of multi hop flow, the + sink on previous hop and source on next hop both have their transactions + running to ensure that the data is safely stored in the channel of the next + hop. +

+ +
+ + \ No newline at end of file Added: incubator/flume/branches/flume-1262/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-1262/src/site/xdoc/index.xml?rev=1351228&view=auto ============================================================================== --- incubator/flume/branches/flume-1262/src/site/xdoc/index.xml (added) +++ incubator/flume/branches/flume-1262/src/site/xdoc/index.xml Mon Jun 18 08:21:19 2012 @@ -0,0 +1,50 @@ + + + + + + Apache Flume + Ralph Goers + + + +
+ +

+ Flume is a distributed, reliable, and available system for efficiently + collecting, aggregating, and moving large amounts of log data from many + different sources to a centralized data store. +

+ + +
+ +
+

+ Flume requires Java 6. +

+
+ +
+

+ Apache Flume 1.2.0 is now available. +

+
+ + + \ No newline at end of file