incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1303838 - in /incubator/accumulo/trunk: ./ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/ core/src/main/java/org/apache/accumulo/core/iterators/ core/src/test/java/org/apa...
Date Thu, 22 Mar 2012 15:33:57 GMT
Author: billie
Date: Thu Mar 22 15:33:56 2012
New Revision: 1303838

URL: http://svn.apache.org/viewvc?rev=1303838&view=rev
Log:
ACCUMULO-475 ACCUMULO-477 ACCUMULO-481 ACCUMULO-139 merged to trunk

Added:
    incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GroupingIterator.java   (with props)
    incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WritableIterator.java   (with props)
Removed:
    incubator/accumulo/trunk/DISCLAIMER
Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/LICENSE
    incubator/accumulo/trunk/NOTICE
    incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
    incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
    incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
    incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
    incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
    incubator/accumulo/trunk/docs/examples/README
    incubator/accumulo/trunk/docs/examples/README.bloom
    incubator/accumulo/trunk/docs/examples/README.combiner
    incubator/accumulo/trunk/docs/examples/README.constraints
    incubator/accumulo/trunk/docs/examples/README.mapred
    incubator/accumulo/trunk/pom.xml

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
  Merged /incubator/accumulo/branches/1.4:r1303025-1303033,1303035-1303115,1303117-1303526,1303528-1303825
  Merged /incubator/accumulo/branches/1.4/src:r1303118-1303526,1303529-1303825

Modified: incubator/accumulo/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/LICENSE?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/LICENSE (original)
+++ incubator/accumulo/trunk/LICENSE Thu Mar 22 15:33:56 2012
@@ -211,40 +211,37 @@ licenses. 
 
 For the org.apache.accumulo.core.bloomfilter.* classes:
 
-    /**
-     *
-     * Copyright (c) 2005, European Commission project OneLab under contract
-     * 034819 (http://www.one-lab.org)
-     * 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 University Catholique de Louvain - UCL
-     *    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.
-     */
+    The BSD License
 
+    Copyright (c) 2005, European Commission project OneLab under contract
+    034819 (http://www.one-lab.org)
+    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 
+       distribution.
+     - Neither the name of the University Catholique de Louvain - UCL
+       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 the src/server/src/main/resources/web/flot/*.js files:
+For the src/server/src/main/resources/web/flot/*.js files, except excanvas.js:
 
     The MIT License
 
@@ -255,23 +252,44 @@ For the src/server/src/main/resources/we
     Copyright 2011, The Dojo Foundation
     Copyright (c) 2007-2009 IOLA and Ole Laursen
     
-    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.
+    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 the src/server/src/main/resources/web/flot/excanvas.js file:
+
+    The Apache License
+
+    Copyright 2006 Google Inc.
+
+    Licensed 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.
 
 For the jline library:
 
@@ -310,3 +328,681 @@ For the jline library:
     IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
     OF THE POSSIBILITY OF SUCH DAMAGE.
 
+For the kryo and minlog libraries:
+
+    The BSD License
+
+    Copyright (c) 2008, Nathan Sweet
+    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 Esoteric Software 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 the protobuf library:
+
+    The BSD License
+
+    Copyright 2008 Google 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:
+
+        * 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 Google Inc. 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 the google-collections library:
+
+    The Apache License
+
+    Copyright (C) 2009 Google Inc.
+
+    Licensed 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.
+
+For the enwiki-20110901-001.xml file in 
+src/examples/wikisearch/ingest/src/test/resources and
+src/examples/wikisearch/query/src/test/resources:
+
+    The Creative Commons Attribution-Share Alike 3.0 License
+
+    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+    COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+    COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+    AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+    
+    BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+    TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+    BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+    CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+    CONDITIONS.
+    
+    1. Definitions
+    
+    "Collective Work" means a work, such as a periodical issue, anthology or
+    encyclopedia, in which the Work in its entirety in unmodified form,
+    along with one or more other contributions, constituting separate and
+    independent works in themselves, are assembled into a collective whole.
+    A work that constitutes a Collective Work will not be considered a
+    Derivative Work (as defined below) for the purposes of this License.
+    
+    "Creative Commons Compatible License" means a license that is listed at
+    http://creativecommons.org/compatiblelicenses that has been approved by
+    Creative Commons as being essentially equivalent to this License,
+    including, at a minimum, because that license: (i) contains terms that
+    have the same purpose, meaning and effect as the License Elements of
+    this License; and, (ii) explicitly permits the relicensing of
+    derivatives of works made available under that license under this
+    License or either a Creative Commons unported license or a Creative
+    Commons jurisdiction license with the same License Elements as this
+    License.
+    
+    "Derivative Work" means a work based upon the Work or upon the Work and
+    other pre-existing works, such as a translation, musical arrangement,
+    dramatization, fictionalization, motion picture version, sound
+    recording, art reproduction, abridgment, condensation, or any other form
+    in which the Work may be recast, transformed, or adapted, except that a
+    work that constitutes a Collective Work will not be considered a
+    Derivative Work for the purpose of this License. For the avoidance of
+    doubt, where the Work is a musical composition or sound recording, the
+    synchronization of the Work in timed-relation with a moving image
+    ("synching") will be considered a Derivative Work for the purpose of
+    this License.
+    
+    "License Elements" means the following high-level license attributes as
+    selected by Licensor and indicated in the title of this License:
+    Attribution, ShareAlike.
+    
+    "Licensor" means the individual, individuals, entity or entities that
+    offers the Work under the terms of this License.
+    
+    "Original Author" means the individual, individuals, entity or entities
+    who created the Work.
+    
+    "Work" means the copyrightable work of authorship offered under the
+    terms of this License.
+    
+    "You" means an individual or entity exercising rights under this License
+    who has not previously violated the terms of this License with respect
+    to the Work, or who has received express permission from the Licensor to
+    exercise rights under this License despite a previous violation.
+    
+    2. Fair Use Rights. Nothing in this license is intended to reduce,
+    limit, or restrict any rights arising from fair use, first sale or other
+    limitations on the exclusive rights of the copyright owner under
+    copyright law or other applicable laws.
+    
+    3. License Grant. Subject to the terms and conditions of this License,
+    Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+    perpetual (for the duration of the applicable copyright) license to
+    exercise the rights in the Work as stated below:
+    
+    to reproduce the Work, to incorporate the Work into one or more
+    Collective Works, and to reproduce the Work as incorporated in the
+    Collective Works;
+    
+    to create and reproduce Derivative Works provided that any such
+    Derivative Work, including any translation in any medium, takes
+    reasonable steps to clearly label, demarcate or otherwise identify that
+    changes were made to the original Work. For example, a translation could
+    be marked "The original work was translated from English to Spanish," or
+    a modification could indicate "The original work has been modified.";
+    
+    to distribute copies or phonorecords of, display publicly, perform
+    publicly, and perform publicly by means of a digital audio transmission
+    the Work including as incorporated in Collective Works;
+    
+    to distribute copies or phonorecords of, display publicly, perform
+    publicly, and perform publicly by means of a digital audio transmission
+    Derivative Works.
+    
+    For the avoidance of doubt, where the Work is a musical composition:
+    
+    Performance Royalties Under Blanket Licenses. Licensor waives the
+    exclusive right to collect, whether individually or, in the event that
+    Licensor is a member of a performance rights society (e.g. ASCAP, BMI,
+    SESAC), via that society, royalties for the public performance or public
+    digital performance (e.g. webcast) of the Work.
+    
+    Mechanical Rights and Statutory Royalties. Licensor waives the exclusive
+    right to collect, whether individually or via a music rights agency or
+    designated agent (e.g. Harry Fox Agency), royalties for any phonorecord
+    You create from the Work ("cover version") and distribute, subject to
+    the compulsory license created by 17 USC Section 115 of the US Copyright
+    Act (or the equivalent in other jurisdictions).
+    
+    Webcasting Rights and Statutory Royalties. For the avoidance of doubt,
+    where the Work is a sound recording, Licensor waives the exclusive right
+    to collect, whether individually or via a performance-rights society
+    (e.g. SoundExchange), royalties for the public digital performance (e.g.
+    webcast) of the Work, subject to the compulsory license created by 17
+    USC Section 114 of the US Copyright Act (or the equivalent in other
+    jurisdictions).
+    
+    The above rights may be exercised in all media and formats whether now
+    known or hereafter devised. The above rights include the right to make
+    such modifications as are technically necessary to exercise the rights
+    in other media and formats. All rights not expressly granted by Licensor
+    are hereby reserved.
+    
+    4. Restrictions. The license granted in Section 3 above is expressly
+    made subject to and limited by the following restrictions:
+    
+    You may distribute, publicly display, publicly perform, or publicly
+    digitally perform the Work only under the terms of this License, and You
+    must include a copy of, or the Uniform Resource Identifier for, this
+    License with every copy or phonorecord of the Work You distribute,
+    publicly display, publicly perform, or publicly digitally perform. You
+    may not offer or impose any terms on the Work that restrict the terms of
+    this License or the ability of a recipient of the Work to exercise of
+    the rights granted to that recipient under the terms of the License. You
+    may not sublicense the Work. You must keep intact all notices that refer
+    to this License and to the disclaimer of warranties. When You
+    distribute, publicly display, publicly perform, or publicly digitally
+    perform the Work, You may not impose any technological measures on the
+    Work that restrict the ability of a recipient of the Work from You to
+    exercise of the rights granted to that recipient under the terms of the
+    License. This Section 4(a) applies to the Work as incorporated in a
+    Collective Work, but this does not require the Collective Work apart
+    from the Work itself to be made subject to the terms of this License. If
+    You create a Collective Work, upon notice from any Licensor You must, to
+    the extent practicable, remove from the Collective Work any credit as
+    required by Section 4(c), as requested. If You create a Derivative Work,
+    upon notice from any Licensor You must, to the extent practicable,
+    remove from the Derivative Work any credit as required by Section 4(c),
+    as requested.
+    
+    You may distribute, publicly display, publicly perform, or publicly
+    digitally perform a Derivative Work only under: (i) the terms of this
+    License; (ii) a later version of this License with the same License
+    Elements as this License; (iii) either the Creative Commons (Unported)
+    license or a Creative Commons jurisdiction license (either this or a
+    later license version) that contains the same License Elements as this
+    License (e.g. Attribution-ShareAlike 3.0 (Unported)); (iv) a Creative
+    Commons Compatible License. If you license the Derivative Work under one
+    of the licenses mentioned in (iv), you must comply with the terms of
+    that license. If you license the Derivative Work under the terms of any
+    of the licenses mentioned in (i), (ii) or (iii) (the "Applicable
+    License"), you must comply with the terms of the Applicable License
+    generally and with the following provisions: (I) You must include a copy
+    of, or the Uniform Resource Identifier for, the Applicable License with
+    every copy or phonorecord of each Derivative Work You distribute,
+    publicly display, publicly perform, or publicly digitally perform; (II)
+    You may not offer or impose any terms on the Derivative Works that
+    restrict the terms of the Applicable License or the ability of a
+    recipient of the Work to exercise the rights granted to that recipient
+    under the terms of the Applicable License; (III) You must keep intact
+    all notices that refer to the Applicable License and to the disclaimer
+    of warranties; and, (IV) when You distribute, publicly display, publicly
+    perform, or publicly digitally perform the Work, You may not impose any
+    technological measures on the Derivative Work that restrict the ability
+    of a recipient of the Derivative Work from You to exercise the rights
+    granted to that recipient under the terms of the Applicable License.
+    This Section 4(b) applies to the Derivative Work as incorporated in a
+    Collective Work, but this does not require the Collective Work apart
+    from the Derivative Work itself to be made subject to the terms of the
+    Applicable License.
+    
+    If You distribute, publicly display, publicly perform, or publicly
+    digitally perform the Work (as defined in Section 1 above) or any
+    Derivative Works (as defined in Section 1 above) or Collective Works (as
+    defined in Section 1 above), You must, unless a request has been made
+    pursuant to Section 4(a), keep intact all copyright notices for the Work
+    and provide, reasonable to the medium or means You are utilizing: (i)
+    the name of the Original Author (or pseudonym, if applicable) if
+    supplied, and/or (ii) if the Original Author and/or Licensor designate
+    another party or parties (e.g. a sponsor institute, publishing entity,
+    journal) for attribution ("Attribution Parties") in Licensor's copyright
+    notice, terms of service or by other reasonable means, the name of such
+    party or parties; the title of the Work if supplied; to the extent
+    reasonably practicable, the Uniform Resource Identifier, if any, that
+    Licensor specifies to be associated with the Work, unless such URI does
+    not refer to the copyright notice or licensing information for the Work;
+    and, consistent with Section 3(b) in the case of a Derivative Work, a
+    credit identifying the use of the Work in the Derivative Work (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). The credit required by this
+    Section 4(c) may be implemented in any reasonable manner; provided,
+    however, that in the case of a Derivative Work or Collective Work, at a
+    minimum such credit will appear, if a credit for all contributing
+    authors of the Derivative Work or Collective Work appears, then as part
+    of these credits and in a manner at least as prominent as the credits
+    for the other contributing authors. For the avoidance of doubt, You may
+    only use the credit required by this Section for the purpose of
+    attribution in the manner set out above and, by exercising Your rights
+    under this License, You may not implicitly or explicitly assert or imply
+    any connection with, sponsorship or endorsement by the Original Author,
+    Licensor and/or Attribution Parties, as appropriate, of You or Your use
+    of the Work, without the separate, express prior written permission of
+    the Original Author, Licensor and/or Attribution Parties.
+    
+    5. Representations, Warranties and Disclaimer
+    
+    UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+    OFFERS THE WORK AS-IS AND ONLY TO THE EXTENT OF ANY RIGHTS HELD IN THE
+    LICENSED WORK BY THE LICENSOR. THE LICENSOR MAKES NO REPRESENTATIONS OR
+    WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY
+    OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE,
+    MARKETABILITY, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,
+    NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR
+    THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME
+    JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
+    EXCLUSION MAY NOT APPLY TO YOU.
+    
+    6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+    LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+    ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+    ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+    BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    
+    7. Termination
+    
+    This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Derivative Works or Collective
+    Works from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+    
+    Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+    
+    8. Miscellaneous
+    
+    Each time You distribute or publicly digitally perform the Work (as
+    defined in Section 1 above) or a Collective Work (as defined in Section
+    1 above), the Licensor offers to the recipient a license to the Work on
+    the same terms and conditions as the license granted to You under this
+    License.
+    
+    Each time You distribute or publicly digitally perform a Derivative
+    Work, Licensor offers to the recipient a license to the original Work on
+    the same terms and conditions as the license granted to You under this
+    License.
+    
+    If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+    
+    No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+    
+    This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that may
+    appear in any communication from You. This License may not be modified
+    without the mutual written agreement of the Licensor and You.
+
+For the jersey-server runtime dependency:
+
+    The COMMON DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.1
+
+    1. Definitions.
+    
+    1.1. “Contributor” means each individual or entity that creates or
+    contributes to the creation of Modifications.
+    1.2. “Contributor Version” means the combination of the Original
+    Software, prior Modifications used by a Contributor (if any), and the
+    Modifications made by that particular Contributor.
+    1.3. “Covered Software” means (a) the Original Software, or (b)
+    Modifications, or (c) the combination of files containing Original
+    Software with files containing Modifications, in each case including
+    portions thereof.
+    1.4. “Executable” means the Covered Software in any form other than
+    Source Code.
+    1.5. “Initial Developer” means the individual or entity that first makes
+    Original Software available under this License.
+    1.6. “Larger Work” means a work which combines Covered Software or
+    portions thereof with code not governed by the terms of this License.
+    1.7. “License” means this document.
+    1.8. “Licensable” means having the right to grant, to the maximum extent
+    possible, whether at the time of the initial grant or subsequently
+    acquired, any and all of the rights conveyed herein.
+    1.9. “Modifications” means the Source Code and Executable form of any of
+    the following:
+    A. Any file that results from an addition to, deletion from or
+    modification of the contents of a file containing Original Software or
+    previous Modifications;
+    B. Any new file that contains any part of the Original Software or
+    previous Modification; or
+    C. Any new file that is contributed or otherwise made available under
+    the terms of this License.
+    1.10. “Original Software” means the Source Code and Executable form of
+    computer software code that is originally released under this License.
+    1.11. “Patent Claims” means any patent claim(s), now owned or hereafter
+    acquired, including without limitation, method, process, and apparatus
+    claims, in any patent Licensable by grantor.
+    1.12. “Source Code” means (a) the common form of computer software code
+    in which modifications are made and (b) associated documentation
+    included in or with such code.
+    1.13. “You” (or “Your”) means an individual or a legal entity exercising
+    rights under, and complying with all of the terms of, this License. For
+    legal entities, “You” includes any entity which controls, is controlled
+    by, or is under common control with You. For purposes of this
+    definition, “control” means (a) the power, direct or indirect, to cause
+    the direction or management of such entity, whether by contract or
+    otherwise, or (b) ownership of more than fifty percent (50%) of the
+    outstanding shares or beneficial ownership of such entity.
+
+    2. License Grants.
+    
+    2.1. The Initial Developer Grant.
+    Conditioned upon Your compliance with Section 3.1 below and subject to
+    third party intellectual property claims, the Initial Developer hereby
+    grants You a world-wide, royalty-free, non-exclusive license:
+    (a) under intellectual property rights (other than patent or trademark)
+    Licensable by Initial Developer, to use, reproduce, modify, display,
+    perform, sublicense and distribute the Original Software (or portions
+    thereof), with or without Modifications, and/or as part of a Larger
+    Work; and
+    (b) under Patent Claims infringed by the making, using or selling of
+    Original Software, to make, have made, use, practice, sell, and offer
+    for sale, and/or otherwise dispose of the Original Software (or portions
+    thereof).
+    (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
+    date Initial Developer first distributes or otherwise makes the Original
+    Software available to a third party under the terms of this License.
+    (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
+    (1) for code that You delete from the Original Software, or (2) for
+    infringements caused by: (i) the modification of the Original Software,
+    or (ii) the combination of the Original Software with other software or
+    devices.
+    2.2. Contributor Grant.
+    Conditioned upon Your compliance with Section 3.1 below and subject to
+    third party intellectual property claims, each Contributor hereby grants
+    You a world-wide, royalty-free, non-exclusive license:
+    (a) under intellectual property rights (other than patent or trademark)
+    Licensable by Contributor to use, reproduce, modify, display, perform,
+    sublicense and distribute the Modifications created by such Contributor
+    (or portions thereof), either on an unmodified basis, with other
+    Modifications, as Covered Software and/or as part of a Larger Work; and
+    (b) under Patent Claims infringed by the making, using, or selling of
+    Modifications made by that Contributor either alone and/or in
+    combination with its Contributor Version (or portions of such
+    combination), to make, use, sell, offer for sale, have made, and/or
+    otherwise dispose of: (1) Modifications made by that Contributor (or
+    portions thereof); and (2) the combination of Modifications made by that
+    Contributor with its Contributor Version (or portions of such
+    combination).
+    (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on
+    the date Contributor first distributes or otherwise makes the
+    Modifications available to a third party.
+    (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
+    (1) for any code that Contributor has deleted from the Contributor
+    Version; (2) for infringements caused by: (i) third party modifications
+    of Contributor Version, or (ii) the combination of Modifications made by
+    that Contributor with other software (except as part of the Contributor
+    Version) or other devices; or (3) under Patent Claims infringed by
+    Covered Software in the absence of Modifications made by that
+    Contributor.
+
+    3. Distribution Obligations.
+    
+    3.1. Availability of Source Code.
+    Any Covered Software that You distribute or otherwise make available in
+    Executable form must also be made available in Source Code form and that
+    Source Code form must be distributed only under the terms of this
+    License. You must include a copy of this License with every copy of the
+    Source Code form of the Covered Software You distribute or otherwise
+    make available. You must inform recipients of any such Covered Software
+    in Executable form as to how they can obtain such Covered Software in
+    Source Code form in a reasonable manner on or through a medium
+    customarily used for software exchange.
+    3.2. Modifications.
+    The Modifications that You create or to which You contribute are
+    governed by the terms of this License. You represent that You believe
+    Your Modifications are Your original creation(s) and/or You have
+    sufficient rights to grant the rights conveyed by this License.
+    3.3. Required Notices.
+    You must include a notice in each of Your Modifications that identifies
+    You as the Contributor of the Modification. You may not remove or alter
+    any copyright, patent or trademark notices contained within the Covered
+    Software, or any notices of licensing or any descriptive text giving
+    attribution to any Contributor or the Initial Developer.
+    3.4. Application of Additional Terms.
+    You may not offer or impose any terms on any Covered Software in Source
+    Code form that alters or restricts the applicable version of this
+    License or the recipients' rights hereunder. You may choose to offer,
+    and to charge a fee for, warranty, support, indemnity or liability
+    obligations to one or more recipients of Covered Software. However, you
+    may do so only on Your own behalf, and not on behalf of the Initial
+    Developer or any Contributor. You must make it absolutely clear that any
+    such warranty, support, indemnity or liability obligation is offered by
+    You alone, and You hereby agree to indemnify the Initial Developer and
+    every Contributor for any liability incurred by the Initial Developer or
+    such Contributor as a result of warranty, support, indemnity or
+    liability terms You offer.
+    3.5. Distribution of Executable Versions.
+    You may distribute the Executable form of the Covered Software under the
+    terms of this License or under the terms of a license of Your choice,
+    which may contain terms different from this License, provided that You
+    are in compliance with the terms of this License and that the license
+    for the Executable form does not attempt to limit or alter the
+    recipient's rights in the Source Code form from the rights set forth in
+    this License. If You distribute the Covered Software in Executable form
+    under a different license, You must make it absolutely clear that any
+    terms which differ from this License are offered by You alone, not by
+    the Initial Developer or Contributor. You hereby agree to indemnify the
+    Initial Developer and every Contributor for any liability incurred by
+    the Initial Developer or such Contributor as a result of any such terms
+    You offer.
+    3.6. Larger Works.
+    You may create a Larger Work by combining Covered Software with other
+    code not governed by the terms of this License and distribute the Larger
+    Work as a single product. In such a case, You must make sure the
+    requirements of this License are fulfilled for the Covered Software.
+
+    4. Versions of the License.
+    
+    4.1. New Versions.
+    Oracle is the initial license steward and may publish revised and/or new
+    versions of this License from time to time. Each version will be given a
+    distinguishing version number. Except as provided in Section 4.3, no one
+    other than the license steward has the right to modify this License.
+    4.2. Effect of New Versions.
+    You may always continue to use, distribute or otherwise make the Covered
+    Software available under the terms of the version of the License under
+    which You originally received the Covered Software. If the Initial
+    Developer includes a notice in the Original Software prohibiting it from
+    being distributed or otherwise made available under any subsequent
+    version of the License, You must distribute and make the Covered
+    Software available under the terms of the version of the License under
+    which You originally received the Covered Software. Otherwise, You may
+    also choose to use, distribute or otherwise make the Covered Software
+    available under the terms of any subsequent version of the License
+    published by the license steward.
+    4.3. Modified Versions.
+    When You are an Initial Developer and You want to create a new license
+    for Your Original Software, You may create and use a modified version of
+    this License if You: (a) rename the license and remove any references to
+    the name of the license steward (except to note that the license differs
+    from this License); and (b) otherwise make it clear that the license
+    contains terms which differ from this License.
+
+    5. DISCLAIMER OF WARRANTY.
+    
+    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS,
+    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+    WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
+    DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+    THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED
+    SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY
+    RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME
+    THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS
+    DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
+    USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+    DISCLAIMER.
+    
+    6. TERMINATION.
+    
+    6.1. This License and the rights granted hereunder will terminate
+    automatically if You fail to comply with terms herein and fail to cure
+    such breach within 30 days of becoming aware of the breach. Provisions
+    which, by their nature, must remain in effect beyond the termination of
+    this License shall survive.
+    6.2. If You assert a patent infringement claim (excluding declaratory
+    judgment actions) against Initial Developer or a Contributor (the
+    Initial Developer or Contributor against whom You assert such claim is
+    referred to as “Participant”) alleging that the Participant Software
+    (meaning the Contributor Version where the Participant is a Contributor
+    or the Original Software where the Participant is the Initial Developer)
+    directly or indirectly infringes any patent, then any and all rights
+    granted directly or indirectly to You by such Participant, the Initial
+    Developer (if the Initial Developer is not the Participant) and all
+    Contributors under Sections 2.1 and/or 2.2 of this License shall, upon
+    60 days notice from Participant terminate prospectively and
+    automatically at the expiration of such 60 day notice period, unless if
+    within such 60 day period You withdraw Your claim with respect to the
+    Participant Software against such Participant either unilaterally or
+    pursuant to a written agreement with Participant.
+    6.3. If You assert a patent infringement claim against Participant
+    alleging that the Participant Software directly or indirectly infringes
+    any patent where such claim is resolved (such as by license or
+    settlement) prior to the initiation of patent infringement litigation,
+    then the reasonable value of the licenses granted by such Participant
+    under Sections 2.1 or 2.2 shall be taken into account in determining the
+    amount or value of any payment or license.
+    6.4. In the event of termination under Sections 6.1 or 6.2 above, all
+    end user licenses that have been validly granted by You or any
+    distributor hereunder prior to termination (excluding licenses granted
+    to You by any distributor) shall survive termination.
+
+    7. LIMITATION OF LIABILITY.
+    
+    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+    DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
+    SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY
+    PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+    OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+    GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL
+    OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+    INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+    LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+    RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+    PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+    OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+    AND LIMITATION MAY NOT APPLY TO YOU.
+    
+    8. U.S. GOVERNMENT END USERS.
+    
+    The Covered Software is a “commercial item,” as that term is defined in
+    48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer
+    software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1))
+    and “commercial computer software documentation” as such terms are used
+    in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
+    48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
+    End Users acquire Covered Software with only those rights set forth
+    herein. This U.S. Government Rights clause is in lieu of, and
+    supersedes, any other FAR, DFAR, or other clause or provision that
+    addresses Government rights in computer software under this License.
+    
+    9. MISCELLANEOUS.
+    
+    This License represents the complete agreement concerning subject matter
+    hereof. If any provision of this License is held to be unenforceable,
+    such provision shall be reformed only to the extent necessary to make it
+    enforceable. This License shall be governed by the law of the
+    jurisdiction specified in a notice contained within the Original
+    Software (except to the extent applicable law, if any, provides
+    otherwise), excluding such jurisdiction's conflict-of-law provisions.
+    Any litigation relating to this License shall be subject to the
+    jurisdiction of the courts located in the jurisdiction and venue
+    specified in a notice contained within the Original Software, with the
+    losing party responsible for costs, including, without limitation, court
+    costs and reasonable attorneys' fees and expenses. The application of
+    the United Nations Convention on Contracts for the International Sale of
+    Goods is expressly excluded. Any law or regulation which provides that
+    the language of a contract shall be construed against the drafter shall
+    not apply to this License. You agree that You alone are responsible for
+    compliance with the United States export administration regulations (and
+    the export control laws and regulation of any other countries) when You
+    use, distribute or otherwise make available any Covered Software.
+    
+    10. RESPONSIBILITY FOR CLAIMS.
+    
+    As between Initial Developer and the Contributors, each party is
+    responsible for claims and damages arising, directly or indirectly, out
+    of its utilization of rights under this License and You agree to work
+    with Initial Developer and Contributors to distribute such
+    responsibility on an equitable basis. Nothing herein is intended or
+    shall be deemed to constitute any admission of liability.
+    
+    NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+    LICENSE (CDDL)
+    
+    The code released under the CDDL shall be governed by the laws of the
+    State of California (excluding conflict-of-law provisions). Any
+    litigation relating to this License shall be subject to the jurisdiction
+    of the Federal Courts of the Northern District of California and the
+    state courts of the State of California, with venue lying in Santa Clara
+    County, California.
+

Modified: incubator/accumulo/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/NOTICE?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/NOTICE (original)
+++ incubator/accumulo/trunk/NOTICE Thu Mar 22 15:33:56 2012
@@ -5,8 +5,15 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 
 This product includes Flot (http://code.google.com/p/flot/), which is 
-licensed under the MIT license.
+licensed under the MIT License.  Flot includes excanvas.js, which is licensed
+under the Apache License.
 Copyright (c) 2007-2009 IOLA and Ole Laursen
+Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)
+Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net)
+Copyright (c) 2010 "Cowboy" Ben Alman
+Copyright 2011, John Resig
+Copyright 2011, The Dojo Foundation
+Copyright 2006 Google Inc.
 
 This product includes JLine (http://jline.sourceforge.net/), which is licensed 
 under the BSD License.
@@ -18,3 +25,30 @@ derived from sources
 Copyright (c) 2005, European Commission project OneLab under contract
 034819 (http://www.one-lab.org)
 All rights reserved.
+
+This product includes Kryo (http://code.google.com/p/kryo/), which is licensed
+under the BSD License.
+Copyright (c) 2008, Nathan Sweet
+All rights reserved.
+
+This product includes Protobuf (http://code.google.com/p/protobuf/), which is
+licensed under the BSD License.
+Copyright 2008 Google Inc.  All rights reserved.
+
+This product includes MinLog (http://code.google.com/p/minlog/), which is 
+licensed under the BSD License.
+Copyright (c) 2008, Nathan Sweet
+All rights reserved.
+
+This product includes Google Collections Library
+(http://code.google.com/p/google-collections/), which is licensed under the 
+Apache License.
+Copyright (C) 2007 Google Inc.
+
+This product includes enwiki-20110901-001.xml, which is a selection from a 
+larger dump 
+(http://dumps.wikimedia.org/enwiki/20110901/enwiki-20110901-pages-meta-history1.xml-p000000010p000002326.7z), 
+the contents of which are licensed under the CC-BY-SA License.
+
+This product depends upon, but does not distribute, Jersey 
+(http://jersey.java.net/) which is licensed under the CDDL License.

Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java (original)
+++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java Thu Mar 22 15:33:56 2012
@@ -109,36 +109,6 @@ public class IteratorSetting {
   }
   
   /**
-   * Get the configuration parameters for this iterator.
-   * 
-   * @return the properties
-   * @deprecated Since 1.4.1, see {@link IteratorSetting.getOptions}
-   */
-  public Map<String,String> getProperties() {
-    return properties;
-  }
-  
-  /**
-   * Set the configuration parameters for this iterator.
-   * 
-   * @param properties
-   *          the properties to set
-   * @deprecated Since 1.4.1, see {@link IteratorSetting.clearOptions} and {@link IteratorSetting.setOptions}
-   */
-  public void setProperties(Map<String,String> properties) {
-    this.properties.clear();
-    addOptions(properties);
-  }
-  
-  /**
-   * @return <tt>true</tt> if this iterator has configuration parameters.
-   * @deprecated Since 1.4.1, see {@link IteratorSetting.getOptions} and test {@link Map.isEmpty}
-   */
-  public boolean hasProperties() {
-    return !properties.isEmpty();
-  }
-  
-  /**
    * Constructs an iterator setting configured for the scan scope with no parameters. (Parameters can be added later.)
    * 
    * @param priority
@@ -169,7 +139,7 @@ public class IteratorSetting {
     setName(name);
     setIteratorClass(iteratorClass);
     this.properties = new HashMap<String,String>();
-    setProperties(properties);
+    addOptions(properties);
   }
   
   /**

Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java (original)
+++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java Thu Mar 22 15:33:56 2012
@@ -208,8 +208,68 @@ final class Compression {
       public boolean isSupported() {
         return true;
       }
-    };
+    },
     
+    SNAPPY(TFile.COMPRESSION_SNAPPY) {
+      // Use base type to avoid compile-time dependencies.
+      private transient CompressionCodec snappyCodec = null;
+      private transient boolean checked = false;
+      private static final String defaultClazz = "org.apache.hadoop.io.compress.SnappyCodec";
+      
+      public CompressionCodec getCodec() throws IOException {
+        if (!isSupported()) {
+          throw new IOException("SNAPPY codec class not specified. Did you forget to set property " + CONF_SNAPPY_CLASS + "?");
+        }
+        return snappyCodec;
+      }
+      
+      @Override
+      public synchronized OutputStream createCompressionStream(OutputStream downStream, Compressor compressor, int downStreamBufferSize) throws IOException {
+        
+        if (!isSupported()) {
+          throw new IOException("SNAPPY codec class not specified. Did you forget to set property " + CONF_SNAPPY_CLASS + "?");
+        }
+        OutputStream bos1 = null;
+        if (downStreamBufferSize > 0) {
+          bos1 = new BufferedOutputStream(downStream, downStreamBufferSize);
+        } else {
+          bos1 = downStream;
+        }
+        conf.setInt("io.compression.codec.snappy.buffersize", 64 * 1024);
+        CompressionOutputStream cos = snappyCodec.createOutputStream(bos1, compressor);
+        BufferedOutputStream bos2 = new BufferedOutputStream(new FinishOnFlushCompressionStream(cos), DATA_OBUF_SIZE);
+        return bos2;
+      }
+      
+      @Override
+      public synchronized InputStream createDecompressionStream(InputStream downStream, Decompressor decompressor, int downStreamBufferSize) throws IOException {
+        if (!isSupported()) {
+          throw new IOException("SNAPPY codec class not specified. Did you forget to set property " + CONF_SNAPPY_CLASS + "?");
+        }
+        if (downStreamBufferSize > 0) {
+          conf.setInt("io.file.buffer.size", downStreamBufferSize);
+        }
+        CompressionInputStream cis = snappyCodec.createInputStream(downStream, decompressor);
+        BufferedInputStream bis2 = new BufferedInputStream(cis, DATA_IBUF_SIZE);
+        return bis2;
+      }
+      
+      @Override
+      public synchronized boolean isSupported() {
+        if (!checked) {
+          checked = true;
+          String extClazz = (conf.get(CONF_SNAPPY_CLASS) == null ? System.getProperty(CONF_SNAPPY_CLASS) : null);
+          String clazz = (extClazz != null) ? extClazz : defaultClazz;
+          try {
+            LOG.info("Trying to load snappy codec class: " + clazz);
+            snappyCodec = (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), conf);
+          } catch (ClassNotFoundException e) {
+            // that is okay
+          }
+        }
+        return snappyCodec != null;
+      }
+    };
     // We require that all compression related settings are configured
     // statically in the Configuration object.
     protected static final Configuration conf = new Configuration();
@@ -219,6 +279,7 @@ final class Compression {
     // data output buffer size to absorb small writes from application.
     private static final int DATA_OBUF_SIZE = 4 * 1024;
     public static final String CONF_LZO_CLASS = "io.compression.codec.lzo.class";
+    public static final String CONF_SNAPPY_CLASS = "io.compression.codec.snappy.class";
     
     Algorithm(String name) {
       this.compressName = name;

Modified: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java (original)
+++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java Thu Mar 22 15:33:56 2012
@@ -124,6 +124,9 @@ public class TFile {
   private static final int MAX_KEY_SIZE = 64 * 1024; // 64KB
   static final Version API_VERSION = new Version((short) 1, (short) 0);
   
+  /** snappy codec **/
+  public static final String COMPRESSION_SNAPPY = "snappy";
+
   /** compression: gzip */
   public static final String COMPRESSION_GZ = "gz";
   /** compression: lzo */
@@ -159,6 +162,7 @@ public class TFile {
    *         <li>"none" - No compression.
    *         <li>"lzo" - LZO compression.
    *         <li>"gz" - GZIP compression.
+   *         <li>"snappy" - Snappy compression
    *         </ul>
    */
   public static String[] getSupportedCompressionAlgorithms() {

Added: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GroupingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GroupingIterator.java?rev=1303838&view=auto
==============================================================================
--- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GroupingIterator.java (added)
+++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GroupingIterator.java Thu Mar 22 15:33:56 2012
@@ -0,0 +1,111 @@
+/**
+ * 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.
+ */
+package org.apache.accumulo.core.iterators;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+
+/**
+ * 
+ */
+public class GroupingIterator implements SortedKeyValueIterator<Key,WritableIterator<Key,Value>> {
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#init(org.apache.accumulo.core.iterators.SortedKeyValueIterator, java.util.Map,
+   * org.apache.accumulo.core.iterators.IteratorEnvironment)
+   */
+  @Override
+  public void init(SortedKeyValueIterator<Key,WritableIterator<Key,Value>> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#hasTop()
+   */
+  @Override
+  public boolean hasTop() {
+    // TODO Auto-generated method stub
+    return false;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#next()
+   */
+  @Override
+  public void next() throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#seek(org.apache.accumulo.core.data.Range, java.util.Collection, boolean)
+   */
+  @Override
+  public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#getTopKey()
+   */
+  @Override
+  public Key getTopKey() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#getTopValue()
+   */
+  @Override
+  public WritableIterator<Key,Value> getTopValue() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#deepCopy(org.apache.accumulo.core.iterators.IteratorEnvironment)
+   */
+  @Override
+  public SortedKeyValueIterator<Key,WritableIterator<Key,Value>> deepCopy(IteratorEnvironment env) {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+}

Propchange: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/GroupingIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WritableIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WritableIterator.java?rev=1303838&view=auto
==============================================================================
--- incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WritableIterator.java (added)
+++ incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WritableIterator.java Thu Mar 22 15:33:56 2012
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+package org.apache.accumulo.core.iterators;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+
+import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.accumulo.core.data.Range;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableComparable;
+
+/**
+ * 
+ */
+public class WritableIterator<K extends WritableComparable<?>,V extends Writable> implements SortedKeyValueIterator<K,V>, Writable {
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#init(org.apache.accumulo.core.iterators.SortedKeyValueIterator, java.util.Map,
+   * org.apache.accumulo.core.iterators.IteratorEnvironment)
+   */
+  @Override
+  public void init(SortedKeyValueIterator<K,V> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#hasTop()
+   */
+  @Override
+  public boolean hasTop() {
+    // TODO Auto-generated method stub
+    return false;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#next()
+   */
+  @Override
+  public void next() throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#seek(org.apache.accumulo.core.data.Range, java.util.Collection, boolean)
+   */
+  @Override
+  public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#getTopKey()
+   */
+  @Override
+  public K getTopKey() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#getTopValue()
+   */
+  @Override
+  public V getTopValue() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.accumulo.core.iterators.SortedKeyValueIterator#deepCopy(org.apache.accumulo.core.iterators.IteratorEnvironment)
+   */
+  @Override
+  public SortedKeyValueIterator<K,V> deepCopy(IteratorEnvironment env) {
+    // TODO Auto-generated method stub
+    return null;
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.hadoop.io.Writable#write(java.io.DataOutput)
+   */
+  @Override
+  public void write(DataOutput out) throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.hadoop.io.Writable#readFields(java.io.DataInput)
+   */
+  @Override
+  public void readFields(DataInput in) throws IOException {
+    // TODO Auto-generated method stub
+    
+  }
+  
+}

Propchange: incubator/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/WritableIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java (original)
+++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java Thu Mar 22 15:33:56 2012
@@ -234,12 +234,12 @@ public class TableOperationsHelperTest {
     setting = t.getIteratorSetting("table", "otherName", IteratorScope.scan);
     Assert.assertEquals(20, setting.getPriority());
     Assert.assertEquals("some.classname", setting.getIteratorClass());
-    Assert.assertFalse(setting.hasProperties());
+    Assert.assertTrue(setting.getOptions().isEmpty());
     setting = t.getIteratorSetting("table", "otherName", IteratorScope.majc);
     Assert.assertEquals(20, setting.getPriority());
     Assert.assertEquals("some.classname", setting.getIteratorClass());
-    Assert.assertTrue(setting.hasProperties());
-    Assert.assertEquals(Collections.singletonMap("key", "value"), setting.getProperties());
+    Assert.assertFalse(setting.getOptions().isEmpty());
+    Assert.assertEquals(Collections.singletonMap("key", "value"), setting.getOptions());
     t.attachIterator("table", setting, EnumSet.of(IteratorScope.minc));
     t.check("table", new String[] {"table.iterator.majc.otherName=20,some.classname", "table.iterator.majc.otherName.opt.key=value",
         "table.iterator.minc.otherName=20,some.classname", "table.iterator.minc.otherName.opt.key=value", "table.iterator.scan.otherName=20,some.classname",});

Modified: incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java (original)
+++ incubator/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/CombinerTest.java Thu Mar 22 15:33:56 2012
@@ -101,7 +101,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.VARLEN);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("2")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -166,7 +166,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, VarLenEncoder.class);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -232,7 +232,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, FixedLenEncoder.class.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -298,7 +298,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, FixedLenEncoder.class.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     
     SortedKeyValueIterator<Key,Value> ai2 = ai.deepCopy(null);
     SortedKeyValueIterator<Key,Value> ai3 = ai.deepCopy(null);
@@ -369,7 +369,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.STRING);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -424,7 +424,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.STRING);
     Combiner.setCombineAllColumns(is, true);
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -475,7 +475,7 @@ public class CombinerTest {
     sources.add(new SortedMapIterator(tm3));
     
     MultiIterator mi = new MultiIterator(sources, true);
-    ai.init(mi, is.getProperties(), null);
+    ai.init(mi, is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -499,7 +499,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, VarLenEncoder.class.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), new DefaultIteratorEnvironment());
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), new DefaultIteratorEnvironment());
     
     // try seeking to the beginning of a key that aggregates
     
@@ -527,7 +527,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.FIXEDLEN);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), new DefaultIteratorEnvironment());
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), new DefaultIteratorEnvironment());
     
     ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false);
     
@@ -546,7 +546,7 @@ public class CombinerTest {
     tm1 = new TreeMap<Key,Value>();
     nkv(tm1, 1, 1, 1, 2, true, 0l, encoder);
     ai = new SummingCombiner();
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), new DefaultIteratorEnvironment());
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), new DefaultIteratorEnvironment());
     
     ai.seek(nr(1, 1, 1, 4, true), EMPTY_COL_FAMS, false);
     
@@ -588,7 +588,7 @@ public class CombinerTest {
     LongCombiner.setEncodingType(is, SummingCombiner.Type.VARLEN);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -601,7 +601,7 @@ public class CombinerTest {
     
     ai = new MinCombiner();
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -644,7 +644,7 @@ public class CombinerTest {
     SummingArrayCombiner.setEncodingType(is, type);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -659,7 +659,7 @@ public class CombinerTest {
     SummingArrayCombiner.setEncodingType(is, encoderClass);
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -674,7 +674,7 @@ public class CombinerTest {
     SummingArrayCombiner.setEncodingType(is, encoderClass.getName());
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
-    ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+    ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
     ai.seek(new Range(), EMPTY_COL_FAMS, false);
     
     assertTrue(ai.hasTop());
@@ -690,7 +690,7 @@ public class CombinerTest {
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
     try {
-      ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+      ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
       Assert.fail();
     } catch (IllegalArgumentException e) {}
     
@@ -699,7 +699,7 @@ public class CombinerTest {
     Combiner.setColumns(is, Collections.singletonList(new IteratorSetting.Column("cf001")));
     
     try {
-      ai.init(new SortedMapIterator(tm1), is.getProperties(), null);
+      ai.init(new SortedMapIterator(tm1), is.getOptions(), null);
       Assert.fail();
     } catch (IllegalArgumentException e) {}
   }

Modified: incubator/accumulo/trunk/docs/examples/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README (original)
+++ incubator/accumulo/trunk/docs/examples/README Thu Mar 22 15:33:56 2012
@@ -34,4 +34,4 @@ Commands intended to be run in bash are 
 
 Commands intended to be run in the Accumulo shell are prefixed by '>'.
 
-[1]: /accumulo/user_manual_1.5-incubating/Accumulo_Shell.html#User_Administration
+[1]: /accumulo/user_manual_1.5/Accumulo_Shell.html#User_Administration

Modified: incubator/accumulo/trunk/docs/examples/README.bloom
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.bloom?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.bloom (original)
+++ incubator/accumulo/trunk/docs/examples/README.bloom Thu Mar 22 15:33:56 2012
@@ -24,7 +24,7 @@ Below table named bloom_test is created 
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.5.x-incubating
+    - version: 1.5.0-SNAPSHOT
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 
@@ -102,7 +102,7 @@ The commands for creating the first tabl
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.4.x-incubating
+    - version: 1.5.0-SNAPSHOT
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 
@@ -124,7 +124,7 @@ The commands for creating the second tab
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.4.x-incubating
+    - version: 1.5.0-SNAPSHOT
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: incubator/accumulo/trunk/docs/examples/README.combiner
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.combiner?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.combiner (original)
+++ incubator/accumulo/trunk/docs/examples/README.combiner Thu Mar 22 15:33:56 2012
@@ -29,7 +29,7 @@ tar distribution.
     
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.5.x-incubating
+    - version: 1.5.0-SNAPSHOT
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: incubator/accumulo/trunk/docs/examples/README.constraints
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.constraints?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.constraints (original)
+++ incubator/accumulo/trunk/docs/examples/README.constraints Thu Mar 22 15:33:56 2012
@@ -31,7 +31,7 @@ the end shows the inserts were not allow
     
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.5.x-incubating
+    - version: 1.5.0-SNAPSHOT
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: incubator/accumulo/trunk/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.mapred?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.mapred (original)
+++ incubator/accumulo/trunk/docs/examples/README.mapred Thu Mar 22 15:33:56 2012
@@ -33,7 +33,7 @@ for the column family count.
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.5.x-incubating
+    - version: 1.5.0-SNAPSHOT
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1303838&r1=1303837&r2=1303838&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Thu Mar 22 15:33:56 2012
@@ -555,11 +555,6 @@
         <version>0.9.94</version>
       </dependency>
       <dependency>
-        <groupId>jfree</groupId>
-        <artifactId>jcommon</artifactId>
-        <version>1.0.12</version>
-      </dependency>
-      <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.0.4</version>
@@ -570,11 +565,6 @@
         <version>1.0.4</version>
       </dependency>
       <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>1.4.1</version>
-      </dependency>
-      <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.3</version>



Mime
View raw message