You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ar...@apache.org on 2012/03/19 08:56:50 UTC
svn commit: r1302314 - in /incubator/flume/branches/branch-1.1.0: CHANGELOG
DEVNOTES LICENSE NOTICE RELEASE-NOTES
Author: arvind
Date: Mon Mar 19 07:56:50 2012
New Revision: 1302314
URL: http://svn.apache.org/viewvc?rev=1302314&view=rev
Log:
Updating top level files for release preparation.
Modified:
incubator/flume/branches/branch-1.1.0/CHANGELOG
incubator/flume/branches/branch-1.1.0/DEVNOTES
incubator/flume/branches/branch-1.1.0/LICENSE
incubator/flume/branches/branch-1.1.0/NOTICE
incubator/flume/branches/branch-1.1.0/RELEASE-NOTES
Modified: incubator/flume/branches/branch-1.1.0/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/CHANGELOG?rev=1302314&r1=1302313&r2=1302314&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/CHANGELOG (original)
+++ incubator/flume/branches/branch-1.1.0/CHANGELOG Mon Mar 19 07:56:50 2012
@@ -1,4 +1,3 @@
-
Release Notes - Flume - Version v1.1.0
** Sub-task
@@ -19,6 +18,7 @@ Release Notes - Flume - Version v1.1.0
* [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
@@ -38,7 +38,6 @@ Release Notes - Flume - Version v1.1.0
* [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-1030] - Distinguish between temporary and longterm failure to avoid repeated beating on dead components
** New Feature
* [FLUME-865] - Implement failover sink
Modified: incubator/flume/branches/branch-1.1.0/DEVNOTES
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/DEVNOTES?rev=1302314&r1=1302313&r2=1302314&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/DEVNOTES (original)
+++ incubator/flume/branches/branch-1.1.0/DEVNOTES Mon Mar 19 07:56:50 2012
@@ -15,16 +15,20 @@ Flume uses the Maven build system and ha
we describe the contents of different directories.
----
-./bin/ Flume startup scripts
-./conf/ Flume configuration file samples
-./flume-ng-core Flume core module
-./flume-ng-dist Flume distribution package module
-./flume-ng-channels Flume channels modules (memory, JDBC and File)
-./flume-ng-node Flume node module
-./flume-ng-sinks Flume sink modules (HDFS)
+./bin/ Startup scripts
+./conf/ Configuration file samples
+./flume-ng-channels Channels
+./flume-ng-clients Clients
+./flume-ng-core Core module
+./flume-ng-dist Distribution package module
+./flume-ng-legacy-sources Legacy sources for compatibility
+./flume-ng-node Node module
+./flume-ng-sinks Sink modules (HDFS)
+./flume-ng-sdk Client SDK for custom clients
----
The files exclusions in `.gitignore` are either autogenerated by Maven or Eclipse.
+Similar exclusion are applied via the svn:ignore property for various directories.
== Building and Testing Flume
@@ -147,6 +151,9 @@ This can be done by going to the Eclipse
to File > Import... > Existing Maven Projects. From there, browse to
and select the directory that contains the root of the Flume project.
+Alternatively you could run mvn eclipse:eclipse from the top directory
+and import the generated projects via Import > Existing Projects menu.
+
== Rules of the Repository
We have a few basic rules for code in the repository.
@@ -186,10 +193,3 @@ depending on comment characters):
* under the License.
*/
----
-
-No build generated files should be checked in. Here are some examples
-of generate files that should not be checked:
-
-* html documentation
-* avro-generated source
-* auto-generated versioning annotations
Modified: incubator/flume/branches/branch-1.1.0/LICENSE
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/LICENSE?rev=1302314&r1=1302313&r2=1302314&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/LICENSE (original)
+++ incubator/flume/branches/branch-1.1.0/LICENSE Mon Mar 19 07:56:50 2012
@@ -200,3 +200,493 @@
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.
+
+================================================================================
+
+This Apache Flume distribution includes the folloiwng sources/binaries. The use
+of these sources/binaries is subject to the terms and conditions of their
+respective licenses.
+
+
+
+For
+ ant-<version>.jar:
+ avro-<version>.jar:
+ avro-ipc-<version>.jar:
+ commons-beanutils-<version>.jar:
+ commons-beanutils-core-<version>.jar:
+ commons-cli-<version>.jar:
+ commons-codec-<version>.jar:
+ commons-collections-<version>.jar:
+ commons-configuration-<version>.jar:
+ commons-dbcp-<version>.jar:
+ commons-digester-<version>.jar:
+ commons-el-<version>.jar:
+ commons-httpclient-<version>.jar:
+ commons-io-<version>.jar:
+ commons-lang-<version>.jar:
+ commons-logging-<version>.jar:
+ commons-math-<version>.jar:
+ commons-net-<version>.jar:
+ commons-pool-<version>.jar:
+ derby-<version>.jar:
+ guava-<version>.jar:
+ hadoop-core-<version>.jar:
+ httpclient-<version>.jar:
+ httpcore-<version>.jar:
+ irclib-<version>.jar:
+ jackson-core-asl-<version>.jar:
+ jackson-mapper-asl-<version>.jar:
+ jasper-compiler-<version>.jar:
+ jasper-runtime-<version>.jar:
+ jets3t-<version>.jar:
+ jetty-<version>.jar:
+ jetty-util-<version>.jar:
+ jsp-2.1-<version>.jar:
+ jsp-api-<version>.jar:
+ jsr305-<version>.jar:
+ kfs-<version>.jar:
+ libthrift-<version>.jar:
+ log4j-<version>.jar:
+ netty-<version>.jar:
+ servlet-api-<version>.jar:
+ snappy-java-<version>.jar:
+ velocity-<version>.jar:
+
+ The Apache License, Version 2.0
+
+
+For core-<version>.jar:
+
+ Eclipse Public License - v 1.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+ CONSTITUTES RECIPIENTS ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+
+ i)changes to the Program, and
+
+ ii)additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates' from
+ a Contributor if it was added to the Program by such Contributor itself or
+ anyone acting on such Contributors behalf. Contributions do not include
+ additions to the Program which: (i) are separate modules of software
+ distributed in conjunction with the Program under their own license agreement,
+ and (ii) are not derivative works of the Program.
+
+ "Contributor" means any person or entity that distributes the Program.
+
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
+
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any, and
+ such derivative works, in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of the
+ Contribution and the Program if, at the time the Contribution is added by the
+ Contributor, such addition of the Contribution causes such combination to be
+ covered by the Licensed Patents. The patent license shall not apply to any
+ other combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor disclaims
+ any liability to Recipient for claims brought by any other entity based on
+ infringement of intellectual property rights or otherwise. As a condition to
+ exercising the rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is required to
+ allow Recipient to distribute the Program, it is Recipients responsibility
+ to acquire that license before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
+ set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
+ and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are offered
+ by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner on
+ or through a medium customarily used for software exchange.
+
+ When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+ Contributors may not remove or alter any copyright notices contained within
+ the Program.
+
+ Each Contributor must identify itself as the originator of its Contribution,
+ if any, in a manner that reasonably allows subsequent Recipients to identify
+ the originator of the Contribution.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore,
+ if a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits and
+ other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such Commercial
+ Contributor in connection with its distribution of the Program in a
+ commercial product offering. The obligations in this section do not apply to
+ any claims or Losses relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must:
+ a) promptly notify the Commercial Contributor in writing of such claim, and
+ b) allow the Commercial Contributor to control, and cooperate with the
+ Commercial Contributor in, the defense and any related settlement
+ negotiations. The Indemnified Contributor may participate in any such claim
+ at its own expense.
+
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If
+ that Commercial Contributor then makes performance claims, or offers
+ warranties related to Product X, those performance claims and warranties are
+ such Commercial Contributors responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a
+ court requires any other Contributor to pay any damages as a result, the
+ Commercial Contributor must pay those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all risks
+ associated with its exercise of rights under this Agreement , including but
+ not limited to the risks and costs of program errors, compliance with
+ applicable laws, damage to or loss of data, programs or equipment, and
+ unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+ LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+ OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by the
+ parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipients patent(s), then such Recipients rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+
+ All Recipients rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipients rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as reasonably practicable. However, Recipients obligations under this
+ Agreement and any licenses granted by Recipient relating to the Program
+ shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement, but in
+ order to avoid inconsistency the Agreement is copyrighted and may only be
+ modified in the following manner. The Agreement Steward reserves the right to
+ publish new versions (including revisions) of this Agreement from time to
+ time. No one other than the Agreement Steward has the right to modify this
+ Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+ Eclipse Foundation may assign the responsibility to serve as the Agreement
+ Steward to a suitable separate entity. Each new version of the Agreement
+ will be given a distinguishing version number. The Program (including
+ Contributions) may always be distributed subject to the version of the
+ Agreement under which it was received. In addition, after a new version of
+ the Agreement is published, Contributor may elect to distribute the Program
+ (including its Contributions) under the new version. Except as expressly
+ stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+ licenses to the intellectual property of any Contributor under this
+ Agreement, whether expressly, by implication, estoppel or otherwise. All
+ rights in the Program not expressly granted under this Agreement are
+ reserved.
+
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to this
+ Agreement will bring a legal action under this Agreement more than one year
+ after the cause of action arose. Each party waives its rights to a jury trial
+ in any resulting litigation.
+
+
+For hsqldb-<version>.jar:
+
+ COPYRIGHTS AND LICENSES (based on BSD License)
+
+ For work developed by the HSQL Development Group:
+
+ Copyright (c) 2001-2010, The HSQL Development Group
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ Neither the name of the HSQL Development Group nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ For work originally developed by the Hypersonic SQL Group:
+
+ Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ Neither the name of the Hypersonic SQL Group nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals on
+ behalf of the Hypersonic SQL Group.
+
+
+For
+ oro-<version>.jar:
+
+ The Apache Software License, Version 1.1
+
+ Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro"
+ must not be used to endorse or promote products derived from this
+ software without prior written permission. For written
+ permission, please contact apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache"
+ or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their
+ name, without prior written permission of the Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ ============================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Software Foundation. For more
+ information on the Apache Software Foundation, please see
+ <http://www.apache.org/>.
+
+
+For
+ paranamer-<version>.jar:
+
+ BSD License
+
+ Copyright (c) 2006 Paul Hammant & ThoughtWorks Inc
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+
+
+For
+ slf4j-api-<version>.jar:
+ slf4j-log4j12-<version>.jar:
+
+ MIT license
+
+ Copyright (c) 2004-2011 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+For xmlenc-<version>.jar:
+
+ Copyright (c) 2005, xmlenc
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Modified: incubator/flume/branches/branch-1.1.0/NOTICE
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/NOTICE?rev=1302314&r1=1302313&r2=1302314&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/NOTICE (original)
+++ incubator/flume/branches/branch-1.1.0/NOTICE Mon Mar 19 07:56:50 2012
@@ -1,5 +1,5 @@
Apache Flume
-Copyright 2011 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/flume/branches/branch-1.1.0/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/incubator/flume/branches/branch-1.1.0/RELEASE-NOTES?rev=1302314&r1=1302313&r2=1302314&view=diff
==============================================================================
--- incubator/flume/branches/branch-1.1.0/RELEASE-NOTES (original)
+++ incubator/flume/branches/branch-1.1.0/RELEASE-NOTES Mon Mar 19 07:56:50 2012
@@ -1,4 +1,4 @@
-Apache Flume 1.0.0-incubating
+Apache Flume 1.1.0-incubating
CONTENTS
1. What is Apache Flume
@@ -19,21 +19,15 @@ uses a simple extensible data model that
application.
2. Status of this release
-This release of Apache Flume is the first release within the Apache
-Incubator, and is labelled and should be considered as an alpha version.
-This means that we do not guarantee any stability, that API and features
-are still likely to change until a final release version.
-This is a 'source-only' release, which means no binary artifacts will
-be distributed as part of the 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.
3. Major changes in this Release
-This section describes the changes between Flume 0.9.x and this version.
-This new codebase of Flume (aka Flume-NG) is refactoring of the first
-generation Flume to solve certain known issues and limitations of the
-original design. It's not backward compatible with previous
-Flume versions (0.9.x) in terms of the configuration as well as plugings.
-More detailed documentation of Flume-NG, please visit
-https://cwiki.apache.org/confluence/display/FLUME/Getting+Started
+Please refer to the CHNAGELONG file for a list of changes that have
+gone into this release.
4. How to Get Involved
The Apache Flume project really needs and appreciates any contributions,