Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@logging.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1226618 - in
 /logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers:
 log4j2-flume-ng/src/site/ log4j2-flume-ng/src/site/xdoc/
 log4j2-flume-og/src/site/ log4j2-flume-og/src/site/xdoc/ src/site/
 src/site/xdoc/manual/
Date: Tue, 03 Jan 2012 03:26:27 -0000
To: commits@logging.apache.org
From: rgoers@apache.org
Message-Id: <20120103032628.3D8A123888D2@eris.apache.org>

Author: rgoers
Date: Tue Jan  3 03:26:27 2012
New Revision: 1226618

URL: http://svn.apache.org/viewvc?rev=1226618&view=rev
Log:
Add flume subprojects to site

Added:
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/xdoc/index.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/xdoc/index.xml
Modified:
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/site.xml?rev=1226618&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/site.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/site.xml Tue Jan  3 03:26:27 2012
@@ -0,0 +1,35 @@
+<!--
+ 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.
+
+-->
+<project name="Flume NG Appender">
+  <bannerLeft>
+    <name>Logging Services</name>
+    <src>../images/ls-logo.jpg</src>
+    <href>../index.html</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>../images/logo.jpg</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Apache" href="http://www.apache.org/" />
+      <item name="Logging Services" href="http://logging.apache.org/"/>
+      <item name="Log4j" href="../index.html"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/xdoc/index.xml?rev=1226618&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-ng/src/site/xdoc/index.xml Tue Jan  3 03:26:27 2012
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<document>
+    <properties>
+        <title>Flume Next Gen Appender</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="Flume Next Gen Appender">
+
+            <p>
+              The Flume NG Appender allows applications to send events to Flume NG Agents.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The Flume NG Appender requires at least Java 5.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/site.xml?rev=1226618&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/site.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/site.xml Tue Jan  3 03:26:27 2012
@@ -0,0 +1,35 @@
+<!--
+ 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.
+
+-->
+<project name="Flume Original Appender">
+  <bannerLeft>
+    <name>Logging Services</name>
+    <src>../images/ls-logo.jpg</src>
+    <href>../index.html</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>../images/logo.jpg</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Apache" href="http://www.apache.org/" />
+      <item name="Logging Services" href="http://logging.apache.org/"/>
+      <item name="Log4j" href="../index.html"/>
+    </links>
+    <menu ref="reports"/>
+  </body>
+</project>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/xdoc/index.xml?rev=1226618&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-flume-og/src/site/xdoc/index.xml Tue Jan  3 03:26:27 2012
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<document>
+    <properties>
+        <title>Flume Original Appender</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="Flume Original Appender">
+
+            <p>
+              The Flume OG Appender allows applications to write to a legacy Flume agent.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The Flume OG Appender requires at least Java 5.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml?rev=1226618&r1=1226617&r2=1226618&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml Tue Jan  3 03:26:27 2012
@@ -130,6 +130,8 @@
       <item name="Log4J 1.2 API" href="log4j12-api/index.html"/>
       <item name="Commons Logging Bridge" href="log4j2-jcl/index.html"/>
       <item name="SLF4J Binding" href="slf4j-impl/index.html"/>
+      <item name="Flume OG" href="log4j2-flume-og/index.html"/>
+      <item name="Flume NG" href="log4j2-flume-ng/index.html"/>
     </menu>
     <links>
       <item name="Logging Wiki" href="http://wiki.apache.org/logging"/>

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml?rev=1226618&r1=1226617&r2=1226618&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml Tue Jan  3 03:26:27 2012
@@ -277,10 +277,16 @@
         </subsection>
         <a name="FlumeAvroAppender"/>
         <subsection name="FlumeAvroAppender">
+          <p><i>This is an optional component supplied in a separate jar.</i></p>
           <p><a href="http://incubator.apache.org/projects/flume.html">Apache Flume</a> 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. The FlumeAppender takes LogEvents and sends
             them to a Flume agent as serialized Avro events for consumption.</p>
+          <p>
+            There are two versions of the Flume Appender available. The first is for "Flume OG", the original
+            version of Flume before it became an Apache project. The second is for "Flume NG", which is
+            maintained by the Apache Flume project.
+          </p>
           <table border="1" width="100%">
             <tr>
               <th>Parameter Name</th>
@@ -300,6 +306,12 @@
               <td>The number of times the agent should be retried before failing to a secondary.</td>
             </tr>
             <tr>
+              <td>batchSize</td>
+              <td>integer</td>
+              <td>Specifies the number of events that should be sent as a batch. The default is 1. <i>This
+                parameter only applies to the Flume NG Appender.</i></td>
+            </tr>
+            <tr>
               <td>compress</td>
               <td>boolean</td>
               <td>When set to true the message body will be compressed using gzip</td>