You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by rg...@apache.org on 2012/07/13 18:24:50 UTC

svn commit: r1361287 [3/3] - in /flume/site/trunk: ./ content/ content/filtered-resources/ content/resources/ content/sphinx/ content/sphinx/_templates/ content/sphinx/_themes/ content/sphinx/_themes/flume/ content/sphinx/_themes/flume/static/ content/...

Added: flume/site/trunk/content/sphinx/conf.py
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/conf.py?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/conf.py (added)
+++ flume/site/trunk/content/sphinx/conf.py Fri Jul 13 16:24:48 2012
@@ -0,0 +1,141 @@
+# 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.
+
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+
+# eventlet/gevent should not monkey patch anything.
+os.environ["GEVENT_NOPATCH"] = "yes"
+os.environ["EVENTLET_NOPATCH"] = "yes"
+#os.environ["CELERY_LOADER"] = "default"
+
+this = os.path.dirname(os.path.abspath(__file__))
+
+# If your extensions are in another directory, add it here. If the directory
+# is relative to the documentation root, use os.path.abspath to make it
+# absolute, like shown here.
+sys.path.append(os.path.join(os.pardir, "tests"))
+sys.path.append(os.path.join(this, "_ext"))
+#import celery
+
+# General configuration
+# ---------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+  'sphinx.ext.autodoc',
+  #~ 'sphinx.ext.autosummary',
+  'sphinx.ext.inheritance_diagram',
+  'sphinx.ext.todo',
+  'sphinx.ext.extlinks',
+  'sphinx.ext.graphviz',
+  'sphinx.ext.intersphinx',
+  #'rst2pdf.pdfbuilder',
+  #~ 'sphinx.ext.doctest',
+]
+
+html_show_sphinx = False
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Apache Flume'
+copyright = '2009-2012 The Apache Software Foundation. Apache Flume, Flume, Apache, the Apache feather logo, and the Apache Flume project logo are trademarks of The Apache Software Foundation.'
+
+keep_warnings = True
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+#version = ".".join(map(str, celery.VERSION[0:2]))
+# The full version, including alpha/beta/rc tags.
+#release = celery.__version__
+
+exclude_trees = ['.build']
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+#intersphinx_mapping = {
+#  "http://docs.python.org/dev": None,
+#  "http://kombu.readthedocs.org/en/latest/": None,
+#  "http://django-celery.readthedocs.org/en/latest": None,
+#}
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'trac'
+highlight_language = 'none'
+
+html_theme_path = ['_themes']
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+#html_static_path = ['../resources/images']
+html_static_path = ['images/feather-small.png']
+
+html_logo = 'images/flume-logo.png'
+
+html_use_smartypants = True
+
+# If false, no module index is generated.
+html_use_modindex = False
+
+# If false, no index is generated.
+html_use_index = False
+
+html_theme = 'flume'
+
+html_theme_options = {
+    'sidebarbgcolor': 'DarkCyan',
+    'sidebartextcolor': 'White',
+    'headtextcolor': 'DarkBlue',
+    'footerbgcolor': 'White',
+    'footertextcolor': 'Black',
+    'headerbgcolor': 'LightGoldenRodYellow',
+    'headertextcolor': 'Green',
+}
+
+html_title = 'Apache Flume'
+
+#html_sidebars = {
+#  '**': ['localtoc.html', 'relations.html', 'sourcelink.html'],
+#}
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+   '**': ['globaltoc.html', 'extranav.html', 'localtoc.html'],
+}
+
+pdf_documents = [
+  ('FlumeUserGuide', 'FlumeUserGuide.tex', 'Flume User Guide', 'Apache Flume'),
+  ('FlumeDeveloperGuide', 'FlumeDeveloperGuide.tex', 'Flume Developer Guide', 'Apache Flume'),
+]
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/contents.rsx
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/contents.rsx?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/contents.rsx (added)
+++ flume/site/trunk/content/sphinx/contents.rsx Fri Jul 13 16:24:48 2012
@@ -0,0 +1,38 @@
+.. 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.
+
+========
+Contents
+========
+
+* :ref:`Project information <project-info.html>`
+* :ref:`Download Apache Flume <http://www.apache.org/dyn/closer.cgi/incubator/flume>`
+* :ref:`Flume Issue Tracking (JIRA) <https://issues.apache.org/jira/browse/FLUME>`
+* :ref:`Flume Source Code (SVN) <https://svn.apache.org/repos/asf/incubator/flume/>`
+* :ref:`License <license.html>`
+
+* :ref:`doc`
+
+* :ref:`resources`
+
+
+ .. toctree::
+    :maxdepth: 2
+
+    index
+    license
+
+    documentation
+    resources
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/documentation.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/documentation.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/documentation.rst (added)
+++ flume/site/trunk/content/sphinx/documentation.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,16 @@
+=============
+Documentation
+=============
+
+The documents below are the very most recent versions of the documentation and may contain features that have not
+been released.
+
+* `Flume User Guide <FlumeUserGuide.html>`_
+* `Flume Developer Guide <FlumeDeveloperGuide.html>`_
+
+.. toctree::
+   :maxdepth: 1
+   :hidden:
+
+   FlumeUserGuide
+   FlumeDeveloperGuide

Added: flume/site/trunk/content/sphinx/download.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/download.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/download.rst (added)
+++ flume/site/trunk/content/sphinx/download.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,37 @@
+========
+Download
+========
+
+Apache Flume is distributed under the `Apache License, version 2.0 <http://www.apache.org/licenses/LICENSE-2.0.html>`_
+
+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.
+
+.. csv-table::
+   :header: "", "Mirrors", "Checksum", "Signature"
+   :widths: 25, 25, 25, 25
+
+   "Apache Flume (tar.gz)",  `apache-flume-1.2.0.tar.gz <http://www.apache.org/dyn/closer.cgi/flume/apache-flume-1.2.0.tar.gz>`_, `apache-flume-1.2.0.tar.gz.md5 <http://www.apache.org/dyn/closer.cgi/flume/apache-flume-1.2.0.tar.gz.md5>`_, `apache-flume-1.2.0.tar.gz.asc <http://www.apache.org/dyn/closer.cgi/flume/apache-flume-1.2.0.tar.gz.asc>`_
+   "Apache Flume (zip)",  `apache-flume-1.2.0.zip <http://www.apache.org/dyn/closer.cgi/flume/apache-flume-1.2.0.zip>`_, `apache-flume-1.2.0.zip.md5 <http://www.apache.org/dyn/closer.cgi/flume/apache-flume-1.2.0.zip.md5>`_, `apache-flume-1.2.0.zip.asc <http://www.apache.org/dyn/closer.cgi/flume/apache-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
+`Verifying Apache HTTP Server Releases <http://httpd.apache.org/dev/verification.html>`_ for more information on
+why you should verify our releases.
+
+The PGP signatures can be verified using PGP or GPG. First download the `KEYS <http://www.apache.org/dist/flume/KEYS>`_
+as well as the asc signature file for the relevant distribution. Make sure you get these files from the
+`main distribution directory <http://www.apache.org/dist/flume/>`_ 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 Mike Percy 66F2054B
+
+Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included in many
+unix distributions.
+
+.. rubric:: Previous_Releases
+
+All previous releases of Apache Flume can be found in the `archive repository <http://archive.apache.org/dist/flume>`_.
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/getinvolved.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/getinvolved.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/getinvolved.rst (added)
+++ flume/site/trunk/content/sphinx/getinvolved.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,11 @@
+===================
+How to Get Involved
+===================
+The Apache Flume project really needs and appreciates any contributions,
+including documentation help, source code and feedback. If you are interested
+in contributing, please visit https://cwiki.apache.org/FLUME/flume-ng.html
+
+.. rubric:: How to Report Issues
+
+The Apache Ivy project uses JIRA for issue tracking. Please report any issues
+you find at http://issues.apache.org/jira/browse/FLUME
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/images/DevGuide_image00.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/DevGuide_image00.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/DevGuide_image00.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flume/site/trunk/content/sphinx/images/DevGuide_image00.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/DevGuide_image01.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/DevGuide_image01.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/DevGuide_image01.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flume/site/trunk/content/sphinx/images/DevGuide_image01.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/UserGuide_image00.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/UserGuide_image00.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image00.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image00.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/UserGuide_image01.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/UserGuide_image01.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image01.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image01.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/UserGuide_image02.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/UserGuide_image02.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image02.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image02.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/UserGuide_image03.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/UserGuide_image03.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image03.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flume/site/trunk/content/sphinx/images/UserGuide_image03.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/feather-small.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/feather-small.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/feather-small.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/images/flume-logo.png
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/images/flume-logo.png?rev=1361287&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flume/site/trunk/content/sphinx/images/flume-logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flume/site/trunk/content/sphinx/index.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/index.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/index.rst (added)
+++ flume/site/trunk/content/sphinx/index.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,47 @@
+.. 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.
+
+
+Welcome to Apache Flume
+=======================
+
+Flume is a distributed, reliable, and available service for
+efficiently collecting, aggregating, and moving large amounts of log
+data. It has a simple and flexible architecture based on streaming
+data flows. It is robust and fault tolerant with tunable reliability
+mechanisms and many failover and recovery mechanisms.  It
+uses a simple extensible data model that allows for online analytic
+application.
+
+.. figure:: images/DevGuide_image00.png
+   :align: center
+   :alt: Agent component diagram
+
+.. rubric:: News
+
+.. toctree::
+   :maxdepth: 1
+   :hidden:
+
+   getinvolved
+   download
+   documentation
+   releases/index
+   mailinglists
+   team
+   source
+   license
+
+..
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/license.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/license.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/license.rst (added)
+++ flume/site/trunk/content/sphinx/license.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,136 @@
+.. 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.
+
+
+Apache License
+--------------
+
+Version 2.0, January 2004
+
+`http://www.apache.org/licenses/ <http://www.apache.org/licenses/>`_
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+**1. Definitions.**
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through
+9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are
+under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of
+fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including
+but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as
+indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix
+below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work
+and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or
+additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the
+Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner.
+For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source
+code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of
+discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in
+writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received
+by Licensor and subsequently incorporated within the Work.
+
+**2. Grant of Copyright License.**  Subject to the terms and conditions of this License, each Contributor hereby grants
+to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce,
+prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative
+Works in Source or Object form.
+
+**3. Grant of Patent License.**  Subject to the terms and conditions of this License, each Contributor hereby grants
+to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license
+applies only to those patent claims licensable by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent
+infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date
+such litigation is filed.
+
+**4. Redistribution.**  You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium,
+with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+2. You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark,
+   and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the
+   Derivative Works; and
+
+4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute
+   must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that
+   do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file
+   distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the
+   Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices
+   normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License.
+   You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to
+   the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the
+   License. You may add Your own copyright statement to Your modifications and may provide additional or different license
+   terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as
+   a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in
+   this License.
+
+**5. Submission of Contributions.** Unless You explicitly state otherwise, any Contribution intentionally submitted for
+inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any
+additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any
+separate license agreement you may have executed with Licensor regarding such Contributions.
+
+**6. Trademarks.** This License does not grant permission to use the trade names, trademarks, service marks, or product
+names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+**7. Disclaimer of Warranty.** Unless required by applicable law or agreed to in writing, Licensor provides the Work
+(and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of
+using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+**8. Limitation of Liability.** In no event and under no legal theory, whether in tort (including negligence), contract,
+or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing,
+shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or
+consequential damages of any character arising as a result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any
+and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such
+damages.
+
+**9. Accepting Warranty or Additional Liability.** While redistributing the Work or Derivative Works thereof, You may
+choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or
+rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on
+Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold
+each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/mailinglists.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/mailinglists.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/mailinglists.rst (added)
+++ flume/site/trunk/content/sphinx/mailinglists.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,13 @@
+=============
+Mailing lists
+=============
+
+These are the mailing lists that have been established for the Apache Flume project. For each list, there is a subscribe, unsubscribe, and an archive link.
+
+.. csv-table::
+   :header: "Name", "Subscribe", "Unsubscribe", "Apache Archive", "Other Archives"
+   :widths: 20, 20, 20, 20, 20
+
+   "Flume User List", `user subscribe <ma...@flume.apache.org>`_, `user unsubscribe <ma...@flume.apache.org>`_, `User List <http://mail-archives.apache.org/mod_mbox/flume-user>`_, ""
+   "Flume Developers List", `dev subscribe <ma...@flume.apache.org>`_, `dev unsubscribe <ma...@flume.apache.org>`_, `Developer List <http://mail-archives.apache.org/mod_mbox/flume-dev>`_, ""
+   "Flume Commits List", `commit subscribe <ma...@flume.apache.org>`_, `commit unsubscribe <ma...@flume.apache.org>`_, `Commit List <http://mail-archives.apache.org/mod_mbox/flume-commits>`_, ""

Added: flume/site/trunk/content/sphinx/releases/1.0.0.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/releases/1.0.0.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/releases/1.0.0.rst (added)
+++ flume/site/trunk/content/sphinx/releases/1.0.0.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,142 @@
+==========================
+Version 1.0.0 - Incubating
+==========================
+
+
+.. rubric:: Status of this release
+
+This release is the first release of Apache Flume within the Apache
+Incubator, and is labelled and should be considered as a beta version.
+
+.. rubric:: Release Documentation
+
+* `Flume User Guide <content/1.0.0-incubating/FlumeUserGuide.pdf>`_
+* `Flume Developer Guide <content/1.0.0-incubating/FlumeDeveloperGuide.pdf>`_
+* `API Documentation <content/1.0.0-incubating/apidocs/index.html>`_
+
+.. rubric:: Changes
+
+* Bug
+    - [FLUME-830] - flume uber jar is missing files from flume-file-channel project
+    - [FLUME-831] - flume-jdbc-channel project has unnecessary direct dependency on log4j API
+    - [FLUME-833] - Audit Direct Library Deps for Flume NG
+    - [FLUME-835] - Issues during clean build of Flume NG
+    - [FLUME-850] - Upgrade the version of Hadoop we use for HDFS sink
+    - [FLUME-858] - HDFSWriterFactory is using operation == for string comparison
+    - [FLUME-863] - Use of unknown sink type leads to NullPointerException
+    - [FLUME-868] - RAT checks fail on builds.apache.org due to local maven repo
+    - [FLUME-869] - JDBC channel tests leave derby.log in module directory
+    - [FLUME-870] - LoggerSink contains two calls to Transaction#commit()
+    - [FLUME-880] - HDFSFormatterFactory is using == operator for String objects
+    - [FLUME-887] - Add maven assembly to build a source only artifact
+    - [FLUME-891] - flume-ng script doesn't build the classpath properly
+    - [FLUME-894] - Add log4j as part of the build
+    - [FLUME-898] - Create DISCLAIMER file for Flume project
+    - [FLUME-900] - RELEASENOTES file needs to be ignored by RAT
+    - [FLUME-902] - Remove thrift references in NG build
+    - [FLUME-903] - Update project metadata in main pom
+    - [FLUME-904] - Update plugin and dependency repos referenced in the main pom
+    - [FLUME-905] - ExecSource silently fails after first transaction with channel
+    - [FLUME-906] - Maven Avro plugin missing an entry in plugin dep management
+    - [FLUME-907] - Maven assembly missing CHANGELOG and other misc files
+    - [FLUME-908] - Clean out old bin and conf contents
+    - [FLUME-909] -  org.apache.flume.node.TestAbstractLogicalNodeManager is failing on some machines
+    - [FLUME-910] - Typo in maven avro plugin groupId in plugin dep management
+    - [FLUME-911] - README should reference Apache Flume rather than just Flume
+    - [FLUME-912] - DEVNOTES contains outdated info
+    - [FLUME-913] - slf4j-log4j binding is excluded from the dist assembly due to test scope
+    - [FLUME-915] - Incorrect license information in various files
+    - [FLUME-916] - DISCLAIMER file has an incorrect URL
+
+* Improvement
+    - [FLUME-846] - Bump Avro version to 1.6.x
+    - [FLUME-867] - Pollable source and sink runners should reduce poll interval after several BACKOFFs
+    - [FLUME-871] - HDFS sink needs to handle blocked/hung append operation
+
+* Question
+    - [FLUME-856] - Move data across hosts
+
+* Task
+    - [FLUME-876] - Update README, NOTICE, LICENSE, and DEVNOTES files
+    - [FLUME-878] - Write release-ready Maven assembly descriptor
+    - [FLUME-879] - Document Flume's ASF release process
+    - [FLUME-885] - Set version number of project to 1.0.0-SNAPSHOT for NG branch
+    - [FLUME-899] - Add Release notes
+    - [FLUME-901] - Make Flume NG build and pass tests against Hadoop 0.23 branch
+
+Release Notes - Flume - Version NG alpha 2 - 20111107
+
+* Bug
+    - [FLUME-773] - ExecSource doesn't rollback transactions on errors
+    - [FLUME-805] - HDFS sink should mangle the names of incomplete files till they are closed
+    - [FLUME-815] - Test json config file has missing bind property
+    - [FLUME-816] - TestJdbcChannelProvider throws OOME based on RNG values
+    - [FLUME-817] - JdbcChannel can not be created by DefaultChannelFactory
+    - [FLUME-818] - PropertiesFileConfigurationProvider doesn't properly log exceptions
+    - [FLUME-822] - JDBC channel lock acquisition failure during take()
+    - [FLUME-823] - The properties configuration provider should fail if the configuration file is not found
+    - [FLUME-825] - Need to remove dependency on hadoop core from flume-ng-core project
+    - [FLUME-827] - Avro client conn failure results in 60-second wait before terminating
+    - [FLUME-848] - Typo is TestHDFSEventSink path
+    - [FLUME-861] - AvroSource is failing on ClosedChannelException
+
+* Improvement
+    - [FLUME-819] - JDBC channel plugin is not registered with Flume node
+    - [FLUME-820] - JDBC channel should support capacity specification.
+    - [FLUME-821] - Derby schema handler should create the necessary indexes for fast lookups.
+    - [FLUME-826] - Update libs
+
+* New Feature
+    - [FLUME-775] - Support text output
+    - [FLUME-814] - Add support for multiple channels to sources
+
+* Task
+    - [FLUME-812] - Enable Apache RAT checks during Maven build
+    - [FLUME-866] - Remove old plugins and log4j appender
+
+Release Notes - Flume - Version NG alpha 1 - 20111021
+
+* Sub-task
+    - [FLUME-737] - Port Flume OG sources and sinks to NG interfaces
+    - [FLUME-739] - Create NG node configuration components
+    - [FLUME-747] - Create NG command line launchers and daemon infrastructure
+    - [FLUME-760] - Implement JDBC based channel implementation
+    - [FLUME-761] - Implement HDFS Flume NG sink
+    - [FLUME-777] - Support text output for HDFS sink
+    - [FLUME-795] - Replace the non-transactional memory channel with new transactional memory channel
+
+* Bug
+    - [FLUME-769] - FLUME-728 - TestJsonFileConfigurationProvider fails due to timing issue
+    - [FLUME-784] - MemoryChannel should poll with timeout on take() rather than block indefinitely
+    - [FLUME-788] - Add more test cases to Flume-NG HDFS test
+    - [FLUME-803] - support re-entrant transaction for memory channel
+    - [FLUME-806] - Fix cast exception in MemoryChannel due to config type changes
+    - [FLUME-807] - Fix tests broken by FLUME-802 changes
+    - [FLUME-809] - Fix channel syntax javadoc bug in PropertiesFileConfigurationProvider
+    - [FLUME-811] - Remove logging of avro client that causes errors with proxy object methods
+
+* Epic
+    - [FLUME-728] - Flume NG refactoring
+
+* Improvement
+    - [FLUME-772] - MemoryChannel should push events back into channel on rollback
+    - [FLUME-774] - Move HDFS sink into a separate module
+    - [FLUME-781] - Add error checking to AvroCLICilent
+    - [FLUME-782] - Instrument AvroSource with counters
+    - [FLUME-783] - Add a batch event RPC call to AvroSource
+    - [FLUME-804] - Support help and node name arguments from the command line
+    - [FLUME-810] - Add help command line options to AvroCLIClient
+
+* New Feature
+    - [FLUME-771] - Implement NG Avro source
+    - [FLUME-778] - Implement NG Avro sink
+    - [FLUME-779] - Create an Avro CLI for sending data to the Avro source
+
+* Task
+    - [FLUME-780] - Reduce default log levels for chatty libraries
+    - [FLUME-785] - Write javadoc for builtin channels
+    - [FLUME-786] - Write javadoc for builtin sources
+    - [FLUME-787] - Write javadoc for builtin sinks
+    - [FLUME-801] - Write NG getting started guide
+    - [FLUME-802] - Complete PropertyFileConfigurationProvider implementation
+

Added: flume/site/trunk/content/sphinx/releases/1.1.0.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/releases/1.1.0.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/releases/1.1.0.rst (added)
+++ flume/site/trunk/content/sphinx/releases/1.1.0.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,74 @@
+==========================
+Version 1.1.0 - Incubating
+==========================
+
+
+.. rubric:: Status of this release
+
+This release is the second release of Apache Flume within the Apache
+Incubator, and is labelled and should be considered as a beta version.
+As compared to the previous release, it has substantially more features
+and functionality along with bug fixes and other enhancements. However
+it is likely to change until a stable release version.
+
+..rubric:: Release Documentation
+
+* `Flume User Guide <content/1.1.0-incubating/FlumeUserGuide.pdf>`_
+* `Flume Developer Guide <content/1.1.0-incubating/FlumeDeveloperGuide.pdf>`_
+* `API Documentation <content/1.1.0-incubating/apidocs/index.html>`_
+
+..rubric:: Changes
+
+* Sub-task
+    - [FLUME-989] - Factor Flume Avro RPC interfaces out into separate Client SDK
+
+* Bug
+    - [FLUME-11] - Tests are setting logger level and should not be.
+    - [FLUME-889] - All events in memory channel are lost on reconfiguration
+    - [FLUME-920] - flume-ng script does not work on Ubuntu Maverick
+    - [FLUME-933] - Default[Source|Sink|Channel]Factory implementation should do reference counting for create/unregistering instances.
+    - [FLUME-936] - MemoryChannel is not thread safe
+    - [FLUME-955] - Rat failure: Legacy Avro Source missing Apache license header
+    - [FLUME-957] - Remove unused flume json config file
+    - [FLUME-960] - TestAvroSink.testFailedConnect is racy and fails often
+    - [FLUME-963] - Add additional tests to TestHDFSEventSink and demystify existing tests
+    - [FLUME-1005] - Several issues with flume-ng script
+    - [FLUME-1009] - HDFSEventSink should return BACKOFF when the channel returns null
+    - [FLUME-1018] - Context can cause NullPointerException
+    - [FLUME-1027] - Missing log4j library in Flume distribution
+    - [FLUME-1029] - Flume build issue with Avro 1.6.2 and empty local repository
+    - [FLUME-1031] - Depricate code generated by Thrift and Avro OG sources that is under com.cloudera package
+
+* Improvement
+    - [FLUME-886] - Create Log4j Appender
+    - [FLUME-919] - flume-ng script should use exec when spawning the java process
+    - [FLUME-922] - Straighten up branches for development
+    - [FLUME-925] - Update build infrastructure to follow Apache Maven guidelines
+    - [FLUME-932] - Making flume-ng components pluggage and name aware
+    - [FLUME-934] - hadoop 1.0.0 sink and corresponding profile
+    - [FLUME-935] - Create abstract implementations of basic channel/transaction semantics
+    - [FLUME-939] - Load flume-env.sh from flume_conf_dir environment variable / system property as opposed to bin directory
+    - [FLUME-945] - Add the ability to specify a default channel for multiplexing channel selector.
+    - [FLUME-956] - Configuration File Template
+    - [FLUME-958] - Miscellaneous build improvements
+    - [FLUME-964] - Remove compiler warnings where possible
+    - [FLUME-978] - Context interface is too basic requiring boilerplate user code
+    - [FLUME-984] - SinkRunner should catch unhanded exceptions and log them like PollingSourceRunner
+    - [FLUME-990] - Hive sink
+    - [FLUME-1019] - Document Sink and related interfaces, defining expected behaviors
+    - [FLUME-1021] - Document API contracts and expected behavior in additional interfaces, including Source
+    - [FLUME-1032] - Fix / clean up Flume NG build
+
+* New Feature
+    - [FLUME-865] - Implement failover sink
+    - [FLUME-892] - Support for SysLog as source
+    - [FLUME-914] - Port the IRC sink to flume ng
+    - [FLUME-930] - Support for multiplexing into different channels from single source.
+    - [FLUME-942] - Support event compatibility with Flume 0.9x
+    - [FLUME-970] - Create user guide for Flume NG
+
+* Task
+    - [FLUME-940] - Remove unused code from Flume
+    - [FLUME-949] - Collapse PollableSink into Sink interface.
+    - [FLUME-977] - Migrate trunk to 0.9.5 branch and move branch flume-728 over to trunk
+    - [FLUME-1028] - Fix jenkins build after addition of submodule

Added: flume/site/trunk/content/sphinx/releases/1.2.0.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/releases/1.2.0.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/releases/1.2.0.rst (added)
+++ flume/site/trunk/content/sphinx/releases/1.2.0.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,207 @@
+=============
+Version 1.2.0
+=============
+
+.. rubric:: Status of this release
+
+This release is the first release of Apache Flume as an Apache top level project and
+is also the first release that is considered ready for production use.
+As compared to the previous releases, it has substantially more features
+and functionality along with bug fixes and other enhancements.
+
+.. rubric:: Release Documentation
+
+* `Flume User Guide <content/1.2.0/FlumeUserGuide.pdf>`_
+* `Flume Developer Guide <content/1.2.0/FlumeDeveloperGuide.pdf>`_
+* `API Documentation <content/1.2.0/apidocs/index.html>`_
+
+.. rubric:: Changes
+
+** New Feature
+    * [FLUME-896] - Implement a Durable Memory Channel
+    * [FLUME-971] - Create developer guide for Flume NG
+    * [FLUME-988] - Client SDK
+    * [FLUME-1085] - Implement a durable FileChannel
+    * [FLUME-1157] - Implement Interceptors (previously known as Decorators) for Flume 1.x
+    * [FLUME-1183] - Implement an HBase Sink which supports table level access
+    * [FLUME-1215] - Implement Timestamp Interceptor
+    * [FLUME-1252] - Asynchronous HBase Sink
+
+** Improvement
+    * [FLUME-828] - LoggerSink representation of the event's body isn't too useful
+    * [FLUME-881] - Would be nice if HDFS Sink would automatically choose best writableFormat based on fileType
+    * [FLUME-979] - ExecSource should optionally restart the command when it exits
+    * [FLUME-985] - All HDFS Operations in HDFSEventSink should have a timeout
+    * [FLUME-1001] - Support custom processors
+    * [FLUME-1011] - AvroSource should have a configurable max thread count
+    * [FLUME-1020] - Implement Kerberos security for HDFS Sink
+    * [FLUME-1030] - Retry logic for failover sink processor to handle downstream exceptions in a predictable manner.
+    * [FLUME-1032] - Fix / clean up Flume NG build
+    * [FLUME-1043] - SDK should mark slf4j deps as optional
+    * [FLUME-1048] - speed up mvn package: stop building .zip packages
+    * [FLUME-1049] - Use hadoop-1.0.0 as basis for default Flume build instead of 0.20.205
+    * [FLUME-1078] - flume-ng script has no way to add, not replace, classpath
+    * [FLUME-1090] - JDBC Channel: Minimize logging under nominal conditions
+    * [FLUME-1117] - Support output to files in Avro container format
+    * [FLUME-1122] - Flume documentation layout should be refactored
+    * [FLUME-1126] - Support RFC 3164 and 5424 syslog format timestamp parsing
+    * [FLUME-1127] - Add configuration support to AbstractAvroEventSerializer for Avro sync interval and compression support
+    * [FLUME-1132] - HDFSEventSink has spurious and verbose log message
+    * [FLUME-1140] - Adding Xms value in flume-env.sh
+    * [FLUME-1160] - ComponentConfigurationFactory catches NullPointerException
+    * [FLUME-1196] - Allow different HDFS Sinks within the same agent to write to HDFS as different users
+    * [FLUME-1198] - Implement a load-balancing sink processor
+    * [FLUME-1212] - Flume should pick HBase jars from HBASE_HOME
+    * [FLUME-1238] - Support active rolling of files created by HDFS Event Sink
+    * [FLUME-1242] - Make flume user & dev guides easily editable
+    * [FLUME-1275] - Add Regex Serializer for HBaseSink
+    * [FLUME-1287] - Add Standalone Example to Docs
+    * [FLUME-1330] - Avro Source should not use Fixed thread pool for boss threads when pool size is specified
+    * [FLUME-1338] - Produce helpful error message in case that timestamp header is missing when time based bucketing is in use
+    * [FLUME-1343] - Improve user guide
+    * [FLUME-1345] - Use apache-flume for the artifact instead of flume-ng-dist
+    * [FLUME-1351] - Add release version to Flume documentation
+
+** Bug
+    * [FLUME-862] - AvroSource breaks when config properties changes different service
+    * [FLUME-1002] - FailoverSinkProcessor replaces sinks with same priority
+    * [FLUME-1017] - syslog classes missing
+    * [FLUME-1026] - Document Thread Safety Guarantees
+    * [FLUME-1027] - Missing log4j library in Flume distribution
+    * [FLUME-1031] - Depricate code generated by Thrift and Avro OG sources that is under com.cloudera package
+    * [FLUME-1035] - slf4j error in flume sdk unit tests
+    * [FLUME-1036] - Reconfiguration of AVRO or NETCAT source causes port bind exception
+    * [FLUME-1037] - NETCAT handler theads terminate under stress test
+    * [FLUME-1040] - Release-Notes says Apache Ivy instead of Apache Flume
+    * [FLUME-1041] - maven warns of duplicate dependencies
+    * [FLUME-1046] - invoking flume-ng script from bin directory fails
+    * [FLUME-1047] - Client SDK has dependency on apache commons
+    * [FLUME-1070] - Fix javadoc for configuring hdfsSink
+    * [FLUME-1074] - AvroSink if any non-caught exception is thrown, an exception is thrown in finally clause
+    * [FLUME-1075] - HDFSEventSink begin is called when transaction opened due to other error
+    * [FLUME-1079] - Flume agent reconfiguration enters permanent bad state
+    * [FLUME-1080] - Issue with HDFSEventSink for append support
+    * [FLUME-1083] - Why does flume binary archive produces the following empty directories: bin/{ia64,amd64} ?
+    * [FLUME-1087] - Restore Client API compat with v1.1.0
+    * [FLUME-1088] - TestWAL.testThreadedAppend fails on jenkins build server
+    * [FLUME-1094] - hadoop.profile=23 build is broken by slf4j-jcl dependencies
+    * [FLUME-1096] - Add support to pass headers through AvroCLIClient
+    * [FLUME-1098] - Hadoop jars from compilation step included in assembly build
+    * [FLUME-1099] - copy-paste issue with RecoverableMemoryChannel
+    * [FLUME-1102] - HDFSEventSink rollInterval is broken
+    * [FLUME-1104] - HDFS rolls the first file incorrectly
+    * [FLUME-1108] - FILE_ROLL sink doesn't accept value 0 for unlimited wait time before rolling file
+    * [FLUME-1109] - Syslog sources need to be refactored
+    * [FLUME-1112] - HDFSCompressedDataStream append does not work
+    * [FLUME-1114] - Syslog Sources does not implement maxsize
+    * [FLUME-1116] - Extra event created for max payload size of 2500 bytes in Flume syslogtcp source
+    * [FLUME-1119] - Remove default ports for syslog sources
+    * [FLUME-1121] - Recoverable Memory Channel cannot recover data
+    * [FLUME-1124] - Lifecycle supervisor can cause thread contention, sometimes causing components to not startup.
+    * [FLUME-1125] - flume-ng script allows flume-env.sh to clobber some command-line arguments
+    * [FLUME-1128] - Conf poller should use schedule with fixed delay
+    * [FLUME-1129] - change foo to agent in sample config
+    * [FLUME-1130] - flume-ng script bad ordering on FLUME_HOME var
+    * [FLUME-1135] - flume-docs exclude is not sufficient for rat
+    * [FLUME-1136] - Remove from executor service does not always remove the runnables from the queue
+    * [FLUME-1142] - Seq source fails with multiplexing channel selector
+    * [FLUME-1148] - Refactor logging
+    * [FLUME-1149] - All sources get same channel list even if configuration is different.
+    * [FLUME-1154] - flume-ng script should first try finding java from PATH and then try using bigtop, instead of vice-versa
+    * [FLUME-1156] - If config file has empty sources, then throws NPE
+    * [FLUME-1163] - HDFSEventSink leaves .tmp files in place when Flume is stopped
+    * [FLUME-1164] - Configure should be called after stopping all events.
+    * [FLUME-1177] - Maven deps on flume-ng-configuration module are brought in transitively instead of directly
+    * [FLUME-1180] - ChannelSelectorFactory creates incorrect selector for multiplexing selector type
+    * [FLUME-1181] - Context must enforce dot-separated prefix for sub-properties.
+    * [FLUME-1182] - Syslog source cannot read format correctly from configuration
+    * [FLUME-1184] - TestFileChannel.testThreaded fails sometimes
+    * [FLUME-1188] - TestRecoverableMemoryChannel.testThreaded can fail sometimes
+    * [FLUME-1190] - DurableFileChannel requires FILE enum definition in ChannelConfigurationType
+    * [FLUME-1194] - RecoverableMemoryChannel prop misspelled -- "rentention" should be "retention"
+    * [FLUME-1200] - HDFSEventSink causes *.snappy file to be created in HDFS even when snappy isn't used (due to missing lib)
+    * [FLUME-1202] - Too many approved licenses
+    * [FLUME-1204] - Add more unit tests for hbase sink
+    * [FLUME-1205] - NPE related to checkpointing when using FileChannel
+    * [FLUME-1213] - HDFS sink should allow bucketpath rounding down.
+    * [FLUME-1216] - Need useful error message when keytab does not exist
+    * [FLUME-1217] - HDFS Event Sink generates warnings due to recent change
+    * [FLUME-1219] - Race conditions in BucketWriter / HDFSEventSink
+    * [FLUME-1220] - Load balancing channel selector needs to be in the configuration type
+    * [FLUME-1221] - ThriftLegacySource doesn't handle fields -> headers conversions for bytebuffers
+    * [FLUME-1226] - FailoverRpcClient should check for NULL batch-size property
+    * [FLUME-1229] - System.nanoTime incorrectly used in filename for HDFS file rolling
+    * [FLUME-1230] - Sink gets initialized even when not active
+    * [FLUME-1231] - Deadlock between BucketWriter and LeaseChecker on shutdown
+    * [FLUME-1232] - Cannot start agent a 3rd time when using FileChannel
+    * [FLUME-1234] - Can't use %P escape sequence for bucket path of HDFS sink
+    * [FLUME-1236] - File channel has a race condition between start and create transaction method
+    * [FLUME-1240] - Add version info to Flume NG
+    * [FLUME-1241] - Flume dist should include the flume-ng-doc directory
+    * [FLUME-1244] - Implement a load-balancing RpcClient with round/robin and random distribution capabilties.
+    * [FLUME-1245] - HDFSCompressedDataStream calls finish() on sync instead of flush()
+    * [FLUME-1246] - FileChannel hangs silently when Hadoop libs not found
+    * [FLUME-1248] - flume-ng script gets broken when it tried to load hbase classpath
+    * [FLUME-1253] - Support for running integration tests
+    * [FLUME-1254] - RpcClient can hang when communication is broken with the source.
+    * [FLUME-1270] - Incorrect default hdfs.callTimeout and hdfs.fileType of  HDFSEventSink in FlumeUserGuide.rst
+    * [FLUME-1271] - Incorrect configuration causes NPE
+    * [FLUME-1280] - Make all config properties of Hbase sinks public constants
+    * [FLUME-1284] - Need host interceptor for hdfs bucket path escape sequence
+    * [FLUME-1288] - Async hbase sink should throw exception when hbase reports failure and check hbase table correctness
+    * [FLUME-1290] - HDFS Sink should accept fileType parameters of arbitrary case
+    * [FLUME-1297] - Flume tests should wait for a few seconds for agent to start.
+    * [FLUME-1301] - HDFSCompressedDataStream can lose data
+    * [FLUME-1303] - java.library.path value is being truncated at first 'n' char
+    * [FLUME-1304] - Allow for faster allocation of checkpoint file.
+    * [FLUME-1306] - LoadBalancingRpcClient should catch exception for invalid RpcClient and failover to valid one
+    * [FLUME-1309] - Integration tests not included in assembly build artifacts
+    * [FLUME-1312] - Host interceptor should support custom headers
+    * [FLUME-1314] - File channel log file can grow beyond max size which causes startup failure
+    * [FLUME-1315] - Null sink should support batching
+    * [FLUME-1316] - AvroSink should be configurable for connect-timeout and request-timeout
+    * [FLUME-1317] - Assembly build pulls in target folder from flume-ng-tests
+    * [FLUME-1319] - File Channel optimize replay of logs when a checkpoint is present
+    * [FLUME-1320] - Add safeguard for checkpoint corruption detection
+    * [FLUME-1322] - ChannelProcessor should catch Throwable to work around close() clobbering uncaught Exceptions
+    * [FLUME-1323] - Remove shutdown hook from FileChannel
+    * [FLUME-1324] - File Channel Log can contain unassigned blocks
+    * [FLUME-1325] - Components should be stopped in the reverse order that they were started
+    * [FLUME-1327] - File Channel can deadlock in when checkpoint happens in between a put/take/commit
+    * [FLUME-1329] - AvroSink can hang during Avro RPC handshake
+    * [FLUME-1331] - Start method of components throwing NoClassDefFoundError are not caught
+    * [FLUME-1333] - Disable running of saveVersion.sh on Windows
+    * [FLUME-1341] - Build fails on jenkins because a file exists in the environment
+    * [FLUME-1344] - AvroSink JMX does not report connection created count accurately
+    * [FLUME-1346] - Build warning from missing maven-sphinx version in reporting section
+    * [FLUME-1347] - Deprecate RecoverableMemoryChannel
+    * [FLUME-1348] - Update the documentation, correcting links and removing incubation.
+    * [FLUME-1349] - Document Hbase sinks.
+    * [FLUME-1352] - Add documentation for HDFS path rounddown.
+    * [FLUME-1355] - Improve user guide section about sink processors
+    * [FLUME-1356] - Document interceptors
+
+** Task
+    * [FLUME-840] - Update project committers in pom file
+    * [FLUME-991] - Make flume configuration validation component specific at time rather than at runtime
+    * [FLUME-1028] - Fix jenkins build after addition of submodule
+    * [FLUME-1050] - Update version of surefire plugin
+    * [FLUME-1073] - Default Log4j configuration file should have a rolling policy
+    * [FLUME-1082] - Add User and dev guide to Flume site
+    * [FLUME-1151] - Exclude docs directory from rat
+    * [FLUME-1189] - Test ReoverableMemoryChannel throughput versus FileChannel
+    * [FLUME-1300] - Update user guide for File Channel
+    * [FLUME-1353] - Ensure license headers are consistent
+
+** Sub-task
+    * [FLUME-748] - Create metric collection infrastructure
+    * [FLUME-962] - Failover capability for Client SDK
+    * [FLUME-992] - Create configuration stubs for sources, channels, sinks etc
+    * [FLUME-999] - Updating init scripts and variables to fit the term agent
+    * [FLUME-1052] - Core configuration component
+    * [FLUME-1053] - Basic SourceConfiguration
+    * [FLUME-1054] - Basic ChannelConfiguration
+    * [FLUME-1055] - Basic SinkConfiguration
+    * [FLUME-1105] - Allow the optional disabling of foreign keys
+    * [FLUME-1107] - Configuration keys for JDBC channel contain redundant prefix.
+    * [FLUME-1113] - JDBC Channel invokes size query on every put

Added: flume/site/trunk/content/sphinx/releases/index.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/releases/index.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/releases/index.rst (added)
+++ flume/site/trunk/content/sphinx/releases/index.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,22 @@
+Releases
+========
+
+.. rubric:: Current Release
+
+The current stable release is :doc:`1.2.0`.
+
+.. toctree::
+   :maxdepth: 1
+   :hidden:
+
+   1.2.0
+
+
+.. rubric:: Older Releases
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   1.0.0
+   1.1.0
\ No newline at end of file

Added: flume/site/trunk/content/sphinx/source.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/source.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/source.rst (added)
+++ flume/site/trunk/content/sphinx/source.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,59 @@
+=================
+Source Repository
+=================
+
+.. rubric:: Overview
+
+This project uses `Subversion <http://subversion.apache.org/>`_ to manage its source code. Instructions on
+Subversion use can be found in the `Subversion documentation <http://svnbook.red-bean.com/>`_.
+
+.. rubric:: Web Access
+
+The following is a link to the online source repository.
+
+.. raw:: html
+
+   <div class="highlight-none"><div class="highlight"><pre>
+   <a href="http://svn.apache.org/viewvc/flume/trunk">http://svn.apache.org/viewc/flume/trunk</a>
+   </pre></div></div>
+
+.. rubric:: Anonymous Access
+
+The source can be checked out anonymously from SVN with this command:::
+
+    $ svn checkout http://svn.apache.org/repos/asf/flume/trunk flume
+
+.. rubric:: Developer Access
+
+Everyone can access the Subversion repository via HTTP, but Committers must checkout the Subversion repository via HTTPS.::
+
+    $ svn checkout https://svn.apache.org/repos/asf/flume/trunk flume
+
+To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for
+your password)::
+
+    $ svn commit --username your-username -m "A message"
+
+.. rubric:: Access From Behind a Firewall
+
+For those users who are stuck behind a corporate firewall which is blocking HTTP access to the Subversion repository,
+you can try to access it via the developer connection:::
+
+    $ svn checkout https://svn.apache.org/repos/asf/flume/trunk flume
+
+.. rubric:: Access Through a Proxy
+
+The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration
+file to indicate which proxy to use. The file's location depends on your operating system. On Linux or Unix it is
+located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA",
+note this is a hidden directory.)
+
+There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client
+and run any command; this will cause the configuration directory and template files to be created.
+
+Example: Edit the 'servers' file and add something like:::
+
+    [global]
+    http-proxy-host = your.proxy.name
+    http-proxy-port = 3128
+

Added: flume/site/trunk/content/sphinx/team.rst
URL: http://svn.apache.org/viewvc/flume/site/trunk/content/sphinx/team.rst?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/content/sphinx/team.rst (added)
+++ flume/site/trunk/content/sphinx/team.rst Fri Jul 13 16:24:48 2012
@@ -0,0 +1,39 @@
+====
+Team
+====
+ A successful project requires many people to play many different roles. Some members write code or documentation,
+ while others are valuable as testers, submitting patches and suggestions.
+
+ The team is comprised of Members, Committers and Contributors. Members are responsible for making project management
+ decisions, voting on releases as well as acting as Committers. Committers have direct access to the source code and
+ actively evolve the codebase. Contributors improve the project through submission of patches and suggestions
+ to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions
+ to the project are greatly appreciated.
+
+ The following individuals are recognized as PMC Members or Project Committers.
+
+.. csv-table::
+   :header: "Name", "Email", "Id", "Organization", "Role"
+   :widths: 30, 25, 15, 15, 15
+
+   "Aaron Kimall", "kimballa@apche.org", "kimballa", "Odiago", "PMC Member"
+   "Andrew Bayer", "abayer@apache.org", "abayer", "Cloudera", "PMC Member"
+   "Ahmed Radwan", "ahmed@apache.org", "ahmed", "Cloudera", "PMC Member"
+   "Arvind Prabhadar", "arvind@apache.org", "arvind", "Cloudera", "PMC Member"
+   "Brock Noland", "brock@apache.org", "brock", "Cloudera", "PMC Member"
+   "Bruce Mitchner", "brucem@apache.org", "brucem", "Cloudera", "PMC Member"
+   "Derek Deeter", "ddeeter@apache.org", "ddeeter", "Intuit", "PMC Member"
+   "Eric Sammer", "esammer@apache.org", "esammer", "Cloudera", "PMC Member"
+   "Hari Shreedharan", "hshreedharen@apache.org", "hshreedharen", "Cloudera", "PMC Member"
+   "Henry Robinson", "henry@apache.org", "henry", "Cloudera", "PMC Member"
+   "Jaroslav Cecho", "jarcec@apache.org", "jarcec", "Cloudera", "PMC Member"
+   "Jonathon Hsieh", "jmhsieh@apache.org", "jmhsieh", "Cloudera", "PMC Member"
+   "Juhani Connolly", "juhanic@apache.org", "juhanic", "CyberAgent", "PMC Member"
+   "Mike Percy", "mpercy@apache.org", "mpercy", "Cloudera", "PMC Member"
+   "Mingjie Lai", "mlai@apache.org", "mlai", "Trend Micro", "PMC Member"
+   "Nick Verbeck", "nerdynick@apache.org", "nerdynick", "", "PMC Member"
+   "Patrick Hunt", "phunt@apache.org", "phunt", "Cloudera", "PMC Member"
+   "Prasad Mujumdar", "prasadm@apache.org", "prasadm", "Cloudera", "PMC Member"
+   "Ralph Goers", "rgoers@apache.org", "rgoers", "Intuit", "PMC Member"
+   "Will McQueen", "will@apache.org", "will", "Cloudera", "PMC Member"
+

Added: flume/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/flume/site/trunk/pom.xml?rev=1361287&view=auto
==============================================================================
--- flume/site/trunk/pom.xml (added)
+++ flume/site/trunk/pom.xml Fri Jul 13 16:24:48 2012
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>9</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.flume</groupId>
+  <artifactId>flume-site</artifactId>
+  <version>1.0.0</version>
+  <packaging>pom</packaging>
+  <name>Apache Flume Site</name>
+
+  <url>http://flume.apache.org/</url>
+
+    <inceptionYear>2009</inceptionYear>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.apache.org/jira/browse/FLUME</url>
+  </issueManagement>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <mailingLists>
+    <mailingList>
+      <archive>http://mail-archives.apache.org/mod_mbox/flume-user/</archive>
+      <name>flume-user</name>
+      <post>user@flume.apache.org</post>
+      <subscribe>user-subscribe@flume.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@flume.apache.org</unsubscribe>
+    </mailingList>
+    <mailingList>
+      <archive>http://mail-archives.apache.org/mod_mbox/flume-dev/</archive>
+      <name>flume-dev</name>
+      <post>dev@flume.apache.org</post>
+      <subscribe>dev-subscribe@flume.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@flume.apache.org</unsubscribe>
+    </mailingList>
+  </mailingLists>
+
+  <scm>
+    <url>scm:svn:https://svn.apache.org/repos/asf/flume/</url>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/flume/</developerConnection>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/flume</connection>
+  </scm>
+
+  <ciManagement>
+    <system>jenkins</system>
+    <url>https://builds.apache.org/job/flume-728/</url>
+  </ciManagement>
+
+  <developers>
+    <developer>
+      <email>jon@cloudera.com</email>
+      <id>jon@cloudera.com</id>
+      <name>Jon Hsieh</name>
+      <organization>Cloudera</organization>
+    </developer>
+    <developer>
+      <email>phunt@cloudera.com</email>
+      <id>phunt@cloudera.com</id>
+      <name>Patrick Hunt</name>
+      <organization>Cloudera</organization>
+    </developer>
+    <developer>
+      <email>henry@cloudera.com</email>
+      <id>henry@cloudera.com</id>
+      <name>Henry Robinson</name>
+      <organization>Cloudera</organization>
+    </developer>
+    <developer>
+      <email>esammer@cloudera.com</email>
+      <id>esammer@cloudera.com</id>
+      <name>E. Sammer</name>
+      <organization>Cloudera</organization>
+    </developer>
+    <developer>
+      <email>bruce.mitchener@gmail.com</email>
+      <id>bruce.mitchener@gmail.com</id>
+      <name>Bruce Mitchener</name>
+      <organization>-</organization>
+    </developer>
+    <developer>
+       <email>rgoers@apache.org</email>
+       <id>rgoers@apache.org</id>
+       <name>Ralph Goers</name>
+       <organization>Intuit</organization>
+    </developer>
+  </developers>
+
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>${site.deploy.url}</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <site.deploy.url>scp://people.apache.org/www/maven.apache.org/</site.deploy.url>
+    <site.output>${project.build.directory}/site</site.output>
+    <sphinx.plugin.version>1.0.2</sphinx.plugin.version>
+  </properties>
+
+  <pluginRepositories>
+
+    <pluginRepository>
+      <id>repo1.maven.org</id>
+      <url>http://repo1.maven.org/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+
+    <pluginRepository>
+      <id>oss.sonatype.org</id>
+      <url>https://oss.sonatype.org/content/groups/public</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
+
+  </pluginRepositories>
+
+
+  <repositories>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://repository.apache.org/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <!-- here the phase you need -->
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/content/filtered-resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <siteDirectory>${basedir}/content</siteDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <excludeDefaults>true</excludeDefaults>
+    <outputDirectory>${site.output}</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.tomdz.maven</groupId>
+        <artifactId>sphinx-maven-plugin</artifactId>
+        <version>${sphinx.plugin.version}</version>
+        <inherited>false</inherited>
+        <configuration>
+          <sourceDirectory>${basedir}/content/sphinx</sourceDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>pdf</id>
+      <activation>
+        <property>
+          <!--name>pdf.skip</name-->
+          <name>pdf.exec</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+            <version>3.1</version>
+            <configuration>
+              <siteDirectory>${basedir}/content</siteDirectory>
+            </configuration>
+            <dependencies>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>site-doc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>site</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+
+      <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <outputDirectory>${project.build.directory}/pdf</outputDirectory>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-project-info-reports-plugin</artifactId>
+            <reportSets>
+              <reportSet>
+                <reports>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.tomdz.maven</groupId>
+            <artifactId>sphinx-maven-plugin</artifactId>
+            <inherited>false</inherited>
+            <configuration>
+              <builder>pdf</builder>
+              <sourceDirectory>${basedir}/content/sphinx</sourceDirectory>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+    <profile>
+      <id>linkcheck</id>
+      <activation>
+        <property>
+          <!--name>linkcheck.skip</name-->
+          <name>linkcheck.exec</name>
+        </property>
+      </activation>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-linkcheck-plugin</artifactId>
+            <version>1.0</version>
+            <configuration>
+              <excludedLinks>
+                <excludedLink>**/archetype/*</excludedLink>
+                <excludedLink>**/ant-tasks/*</excludedLink>
+                <excludedLink>**/doxia/*</excludedLink>
+                <excludedLink>**/jxr/*</excludedLink>
+                <excludedLink>**/maven-1.x/*</excludedLink>
+                <excludedLink>**/mercury/*</excludedLink>
+                <excludedLink>**/scm/*</excludedLink>
+                <excludedLink>**/shared/*</excludedLink>
+                <excludedLink>**/skins/*</excludedLink>
+                <excludedLink>**/surefire/*</excludedLink>
+                <excludedLink>**/wagon/*</excludedLink>
+                <excludedLink>**/plugins/maven-*</excludedLink>
+                <excludedLink>**/ref/*</excludedLink>
+                <excludedLink>**/maven-model/*</excludedLink>
+                <excludedLink>**/maven-settings/*</excludedLink>
+                <excludedLink>irc://*</excludedLink>
+              </excludedLinks>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+  </profiles>
+</project>