You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2010/10/20 00:21:47 UTC

svn commit: r1024435 - in /hadoop/hive/branches/branch-0.6: CHANGES.txt LICENSE NOTICE RELEASE_NOTES.txt build-common.xml build.xml contrib/build.xml hbase-handler/build.xml hwi/build.xml lib/json-LICENSE.txt metastore/build.xml ql/build.xml

Author: jvs
Date: Tue Oct 19 22:21:47 2010
New Revision: 1024435

URL: http://svn.apache.org/viewvc?rev=1024435&view=rev
Log:
HIVE-1729. Satisfy ASF release management requirements
(Carl Steinbach via jvs)


Added:
    hadoop/hive/branches/branch-0.6/LICENSE
    hadoop/hive/branches/branch-0.6/NOTICE
    hadoop/hive/branches/branch-0.6/RELEASE_NOTES.txt
Modified:
    hadoop/hive/branches/branch-0.6/CHANGES.txt
    hadoop/hive/branches/branch-0.6/build-common.xml
    hadoop/hive/branches/branch-0.6/build.xml
    hadoop/hive/branches/branch-0.6/contrib/build.xml
    hadoop/hive/branches/branch-0.6/hbase-handler/build.xml
    hadoop/hive/branches/branch-0.6/hwi/build.xml
    hadoop/hive/branches/branch-0.6/lib/json-LICENSE.txt
    hadoop/hive/branches/branch-0.6/metastore/build.xml
    hadoop/hive/branches/branch-0.6/ql/build.xml

Modified: hadoop/hive/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/CHANGES.txt?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.6/CHANGES.txt Tue Oct 19 22:21:47 2010
@@ -269,6 +269,9 @@ Release 0.6.0 -  Unreleased
     HIVE-1726. Update README file for 0.6.0 release
     (Carl Steinbach via jvs)
 
+    HIVE-1729. Satisfy ASF release management requirements
+    (Carl Steinbach via jvs)
+
   OPTIMIZATIONS
 
     HIVE-1348. Move inputFileChanged() from ExecMapper to where it is needed

Added: hadoop/hive/branches/branch-0.6/LICENSE
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/LICENSE?rev=1024435&view=auto
==============================================================================
--- hadoop/hive/branches/branch-0.6/LICENSE (added)
+++ hadoop/hive/branches/branch-0.6/LICENSE Tue Oct 19 22:21:47 2010
@@ -0,0 +1,443 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+APACHE HIVE SUBCOMPONENTS:
+
+The Apache Hive project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses. 
+
+For the org.apache.hadoop.hive.ql.util.jdbm.* classes:
+
+/**
+ * JDBM LICENSE v1.00
+ *
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ *    statements and notices.  Redistributions must also contain a
+ *    copy of this document.
+ *
+ * 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 name "JDBM" must not be used to endorse or promote
+ *    products derived from this Software without prior written
+ *    permission of Cees de Groot.  For written permission,
+ *    please contact cg@cdegroot.com.
+ *
+ * 4. Products derived from this Software may not be called "JDBM"
+ *    nor may "JDBM" appear in their names without prior written
+ *    permission of Cees de Groot.
+ *
+ * 5. Due credit should be given to the JDBM Project
+ *    (http://jdbm.sourceforge.net/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JDBM PROJECT AND CONTRIBUTORS
+ * ``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
+ * CEES DE GROOT OR ANY 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.
+ *
+ * Copyright 2000 (C) Cees de Groot. All Rights Reserved.
+ * Copyright 2000-2001 (C) Alex Boisvert. All Rights Reserved.
+ * Contributions are Copyright (C) 2000 by their associated contributors.
+ *
+ * $Id: RecordManager.java,v 1.3 2005/06/25 23:12:31 doomdark Exp $
+ */
+
+
+For the ANTLR libraries:
+
+Copyright (c) 2003-2008, Terence Parr
+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 author 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 StringTemplate library:
+
+Copyright (c) 2008, Terence Parr
+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 author 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 ASM library:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+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 the org.json library:
+
+Copyright (c) 2002 JSON.org
+
+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 shall be used for Good, not Evil.
+
+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 JLine library:
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+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 JLine 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 SLF4J library:
+
+Copyright (c) 2004-2008 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.
+ 
\ No newline at end of file

Added: hadoop/hive/branches/branch-0.6/NOTICE
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/NOTICE?rev=1024435&view=auto
==============================================================================
--- hadoop/hive/branches/branch-0.6/NOTICE (added)
+++ hadoop/hive/branches/branch-0.6/NOTICE Tue Oct 19 22:21:47 2010
@@ -0,0 +1,26 @@
+Apache Hive
+Copyright 2008-2010 The Apache Software Foundation
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+This product includes software developed by The JDBM Project
+(http://jdbm.sourceforge.net/).
+
+This product includes/uses ANTLR (http://www.antlr.org/),
+Copyright (c) 2003-2008, Terrence Parr.
+
+This product includes/uses StringTemplate (http://www.stringtemplate.org/),
+Copyright (c) 2008, Terrence Parr.
+
+This product includes/uses ASM (http://asm.ow2.org/),
+Copyright (c) 2000-2005 INRIA, France Telecom.
+
+This product includes/uses org.json (http://www.json.org/java/index.html),
+Copyright (c) 2002 JSON.org
+
+This product includes/uses JLine (http://jline.sourceforge.net/),
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>.
+
+This product includes/uses SLF4J (http://www.slf4j.org/),
+Copyright (c) 2004-2008 QOS.ch

Added: hadoop/hive/branches/branch-0.6/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/RELEASE_NOTES.txt?rev=1024435&view=auto
==============================================================================
--- hadoop/hive/branches/branch-0.6/RELEASE_NOTES.txt (added)
+++ hadoop/hive/branches/branch-0.6/RELEASE_NOTES.txt Tue Oct 19 22:21:47 2010
@@ -0,0 +1,228 @@
+
+Release Notes - Hive - Version 0.6.0
+
+** New Feature
+    * [HIVE-259] - Add PERCENTILE aggregate function
+    * [HIVE-675] - add database/schema support Hive QL
+    * [HIVE-705] - Hive HBase Integration (umbrella)
+    * [HIVE-801] - row-wise IN would be useful
+    * [HIVE-862] - CommandProcessor should return DriverResponse
+    * [HIVE-894] - add udaf max_n, min_n to contrib
+    * [HIVE-917] - Bucketed Map Join
+    * [HIVE-972] - support views
+    * [HIVE-1002] - multi-partition inserts
+    * [HIVE-1027] - Create UDFs for XPath expression evaluation
+    * [HIVE-1032] - Better Error Messages for Execution Errors
+    * [HIVE-1087] - Let user script write out binary data into a table
+    * [HIVE-1121] - CombinedHiveInputFormat for hadoop 19
+    * [HIVE-1127] - Add UDF to create struct
+    * [HIVE-1131] - Add column lineage information to the pre execution hooks
+    * [HIVE-1132] - Add metastore API method to get partition by name
+    * [HIVE-1134] - bucketing mapjoin where the big table contains more than 1 big partition
+    * [HIVE-1178] - enforce bucketing for a table
+    * [HIVE-1179] - Add UDF array_contains
+    * [HIVE-1193] - ensure sorting properties for a table
+    * [HIVE-1194] - sorted merge join
+    * [HIVE-1197] - create a new input format where a mapper spans a file
+    * [HIVE-1219] - More robust handling of metastore connection failures
+    * [HIVE-1238] - Get  partitions with a partial specification
+    * [HIVE-1255] - Add mathematical UDFs PI, E, degrees, radians, tan, sign, and atan
+    * [HIVE-1270] - Thread pool size in Thrift metastore server should be configurable
+    * [HIVE-1272] - Add SymlinkTextInputFormat to Hive
+    * [HIVE-1278] - Partition name to values conversion conversion method
+    * [HIVE-1307] - More generic and efficient merge method
+    * [HIVE-1332] - Archiving partitions
+    * [HIVE-1351] - Tool to cat rcfiles
+    * [HIVE-1397] - histogram() UDAF for a numerical column
+    * [HIVE-1401] - Web Interface can ony browse default
+    * [HIVE-1410] - Add TCP keepalive option for the metastore server
+    * [HIVE-1439] - Alter the number of buckets for a table
+
+
+** Bug
+    * [HIVE-287] - support count(*) and count distinct on multiple columns
+    * [HIVE-763] - getSchema returns invalid column names, getThriftSchema does not return old style string schemas
+    * [HIVE-1011] - GenericUDTFExplode() throws NPE when given nulls
+    * [HIVE-1022] - desc Table should work
+    * [HIVE-1029] - typedbytes does not support nulls
+    * [HIVE-1042] - function in a transform with more than 1 argument fails
+    * [HIVE-1056] - Predicate push down does not work with UDTF's
+    * [HIVE-1064] - NPE when operating HiveCLI in distributed mode
+    * [HIVE-1066] - TestContribCliDriver failure in serde_typedbytes.q, serde_typedbytes2.q, and serde_typedbytes3.q
+    * [HIVE-1075] - Make it possible for users to recover data when moveTask fails
+    * [HIVE-1085] - ColumnarSerde should not be the default Serde when user specified a fileformat using 'stored as'.
+    * [HIVE-1086] - Add "-Doffline=true" option to ant
+    * [HIVE-1090] - Skew Join does not work in distributed env.
+    * [HIVE-1092] - Conditional task does not increase finished job counter when filter job out.
+    * [HIVE-1094] - Disable streaming last table if there is a skew key in previous tables.
+    * [HIVE-1116] - bug with alter table rename when table has property EXTERNAL=FALSE
+    * [HIVE-1124] - create view should expand the query text consistently
+    * [HIVE-1125] - Hive CLI shows 'Ended Job=' at the beginning of the job
+    * [HIVE-1129] - Assertion in ExecDriver.execute when assertions are enabled in HADOOP_OPTS
+    * [HIVE-1142] - "datanucleus" typos in conf/hive-default.xml
+    * [HIVE-1167] - Use TreeMap instead of Property to make explain extended deterministic
+    * [HIVE-1174] - Job counter error if "hive.merge.mapfiles" equals true
+    * [HIVE-1176] - 'create if not exists' fails for a table name with 'select' in it
+    * [HIVE-1184] - Expression Not In Group By Key error is sometimes masked
+    * [HIVE-1185] - Fix RCFile resource leak when opening a non-RCFile
+    * [HIVE-1195] - Increase ObjectInspector[] length on demand
+    * [HIVE-1200] - Fix CombineHiveInputFormat to work with multi-level of directories in a single table/partition
+    * [HIVE-1204] - typedbytes: writing to stderr kills the mapper
+    * [HIVE-1205] - RowContainer should flush out  dummy rows when the table desc is null
+    * [HIVE-1207] - ScriptOperator AutoProgressor does not set the interval
+    * [HIVE-1242] - CombineHiveInputFormat does not work for compressed text files
+    * [HIVE-1247] - hints cannot be passed to transform statements
+    * [HIVE-1252] - Task breaking bug when breaking after a filter operator
+    * [HIVE-1253] - date_sub() function returns wrong date because of daylight saving time difference
+    * [HIVE-1257] - joins between HBase tables and other tables (whether HBase or not) are broken
+    * [HIVE-1258] - set merge files to files when bucketing/sorting is being enforced
+    * [HIVE-1261] - ql.metadata.Hive#close() should check for null metaStoreClient
+    * [HIVE-1268] - Cannot start metastore thrift server on a specific port
+    * [HIVE-1271] - Case sensitiveness of type information specified when using custom reducer causes type mismatch
+    * [HIVE-1273] - UDF_Percentile NullPointerException
+    * [HIVE-1274] - bug in sort merge join if the big table does not have any row
+    * [HIVE-1275] - TestHBaseCliDriver hangs
+    * [HIVE-1277] - Select query with specific projection(s) fails if the local file system directory for ${hive.user.scratchdir} does not exist.
+    * [HIVE-1280] - problem in combinehiveinputformat with nested directories
+    * [HIVE-1281] - Bucketing column names in create table should be case-insensitive
+    * [HIVE-1286] - error/info message being emitted on standard output
+    * [HIVE-1290] - sort merge join does not work with bucketizedhiveinputformat
+    * [HIVE-1291] - Fix UDAFPercentile ndexOutOfBoundsException
+    * [HIVE-1294] - HIVE_AUX_JARS_PATH interferes with startup of Hive Web Interface
+    * [HIVE-1298] - unit test symlink_text_input_format.q needs ORDER BY for determinism
+    * [HIVE-1308] - <boolean> = <boolean> throws NPE
+    * [HIVE-1311] - bug is use of hadoop supports splittable
+    * [HIVE-1312] - hive trunk does not compile with hadoop 0.17 any more
+    * [HIVE-1315] - bucketed sort merge join breaks after dynamic partition insert
+    * [HIVE-1317] - CombineHiveInputFormat throws exception when partition name contains special characters to URI
+    * [HIVE-1320] - NPE with lineage in a query of union alls on joins.
+    * [HIVE-1321] - bugs with temp directories, trailing blank fields in HBase bulk load
+    * [HIVE-1322] - Cached FileSystem can lead to persistant IOExceptions
+    * [HIVE-1323] - leading dash in partition name is not handled properly
+    * [HIVE-1325] - dynamic partition insert should throw an exception if the number of target table columns + dynamic partition columns does not equal to the number of select columns
+    * [HIVE-1326] - RowContainer uses hard-coded '/tmp/' path for temporary files
+    * [HIVE-1327] - Group by partition column returns wrong results
+    * [HIVE-1330] - fatal error check omitted for reducer-side operators
+    * [HIVE-1331] - select * does not work if different partitions contain different formats
+    * [HIVE-1338] - Fix bin/ext/jar.sh to work with hadoop 0.20 and above
+    * [HIVE-1341] - Filter Operator Column Pruning should preserve the column order
+    * [HIVE-1345] - TypedBytesSerDe fails to create table with multiple columns.
+    * [HIVE-1350] - hive.query.id is not unique 
+    * [HIVE-1352] - rcfilecat should use '\t' to separate columns and print '\r\n' at the end of each row.
+    * [HIVE-1353] - load_dyn_part*.q tests need ORDER BY for determinism
+    * [HIVE-1354] - partition level properties honored if it exists
+    * [HIVE-1364] - Increase the maximum length of various metastore fields, and remove TYPE_NAME from COLUMNS primary key
+    * [HIVE-1365] - Bug in SMBJoinOperator which may causes a final part  of the results in some cases.
+    * [HIVE-1366] - inputFileFormat error if the merge job takes a different input file format than the default output file format
+    * [HIVE-1371] - remove blank in rcfilecat
+    * [HIVE-1373] - Missing connection pool plugin in Eclipse classpath
+    * [HIVE-1377] - getPartitionDescFromPath() in CombineHiveInputFormat should handle matching by path
+    * [HIVE-1388] - combinehiveinputformat does not work if files are of different types
+    * [HIVE-1403] - Reporting progress to JT during closing files in FileSinkOperator
+    * [HIVE-1407] - Add hadoop-*-tools.jar to Eclipse classpath
+    * [HIVE-1409] - File format information is retrieved from first partition
+    * [HIVE-1411] - DataNucleus throws NucleusException if core-3.1.1 JAR appears more than once on CLASSPATH
+    * [HIVE-1412] - CombineHiveInputFormat bug on tablesample
+    * [HIVE-1417] - Archived partitions throw error with queries calling getContentSummary
+    * [HIVE-1418] - column pruning not working with lateral view
+    * [HIVE-1420] - problem with sequence and rcfiles are mixed for null partitions
+    * [HIVE-1421] - problem with sequence and rcfiles are mixed for null partitions
+    * [HIVE-1425] - hive.task.progress should be added to conf/hive-default.xml
+    * [HIVE-1428] - ALTER TABLE ADD PARTITION fails with a remote Thrift metastore
+    * [HIVE-1435] - Upgraded naming scheme causes JDO exceptions
+    * [HIVE-1448] - bug in 'set fileformat'
+    * [HIVE-1454] - insert overwrite and CTAS fail in hive local mode
+    * [HIVE-1455] - lateral view does not work with column pruning 
+    * [HIVE-1492] - FileSinkOperator should remove duplicated files from the same task based on file sizes
+    * [HIVE-1524] - parallel execution failed if mapred.job.name is set
+    * [HIVE-1594] - Typo of hive.merge.size.smallfiles.avgsize prevents change of value
+    * [HIVE-1613] - hive --service jar looks for hadoop version but was not defined
+    * [HIVE-1615] - Web Interface JSP needs Refactoring for removed meta store methods
+    * [HIVE-1681] - ObjectStore.commitTransaction() does not properly handle transactions that have already been rolled back
+    * [HIVE-1697] - Migration scripts should increase size of PARAM_VALUE in PARTITION_PARAMS
+
+** Improvement
+    * [HIVE-543] - provide option to run hive in local mode
+    * [HIVE-964] - handle skewed keys for a join in a separate job
+    * [HIVE-990] - Incorporate CheckStyle into Hive's build.xml
+    * [HIVE-1047] - Merge tasks in GenMRUnion1
+    * [HIVE-1068] - CREATE VIEW followup:  add a "table type" enum attribute in metastore's MTable, and also null out irrelevant attributes for MTable instances which describe views
+    * [HIVE-1069] - CREATE VIEW followup:  find and document current expected version of thrift, and regenerate code to match
+    * [HIVE-1093] - Add a "skew join map join size" variable to control the input size of skew join's following map join job.
+    * [HIVE-1102] - make number of concurrent tasks configurable
+    * [HIVE-1108] - QueryPlan to be independent from BaseSemanticAnalyzer
+    * [HIVE-1109] - Structured temporary directories
+    * [HIVE-1110] - add counters to show that skew join triggered
+    * [HIVE-1117] - Make QueryPlan serializable
+    * [HIVE-1118] - Add hive.merge.size.per.task to HiveConf
+    * [HIVE-1119] - Make all Tasks and Works serializable
+    * [HIVE-1120] - In ivy offline mode, don't delete downloaded jars
+    * [HIVE-1122] - Make ql/metadata/Table and Partition serializable
+    * [HIVE-1128] - Let max/min handle complex types like struct
+    * [HIVE-1136] - add type-checking setters for HiveConf class to match existing getters
+    * [HIVE-1144] - CREATE VIEW followup:  support ALTER TABLE SET TBLPROPERTIES on views
+    * [HIVE-1150] - Add comment to explain why we check for dir first in add_partitions().
+    * [HIVE-1152] - Add metastore API method to drop partition / append partition by name
+    * [HIVE-1164] - drop_partition_by_name() should use drop_partition_common()
+    * [HIVE-1190] - Configure build to download Hadoop tarballs from Facebook mirror instead of Apache
+    * [HIVE-1198] - When checkstyle is activated for Hive in Eclipse environment, it shows all checkstyle problems as errors.
+    * [HIVE-1212] - Explicitly say "Hive Internal Error" to ease debugging
+    * [HIVE-1216] - Show the row with error in mapper/reducer
+    * [HIVE-1220] - accept TBLPROPERTIES on CREATE TABLE/VIEW
+    * [HIVE-1228] - allow HBase key column to be anywhere in Hive table
+    * [HIVE-1241] - add pre-drops in bucketmapjoin*.q
+    * [HIVE-1244] - add backward-compatibility constructor to HiveMetaStoreClient
+    * [HIVE-1246] - mapjoin followed by another mapjoin should be performed in a single query
+    * [HIVE-1260] - from_unixtime should implment a overloading function to accept only bigint type
+    * [HIVE-1276] - optimize bucketing 
+    * [HIVE-1295] - facilitate HBase bulk loads from Hive
+    * [HIVE-1296] - CLI set and set -v commands should dump properties in alphabetical order
+    * [HIVE-1297] - error message in Hive.checkPaths dumps Java array address instead of path string
+    * [HIVE-1300] - support: alter table touch partition
+    * [HIVE-1306] - cleanup the jobscratchdir
+    * [HIVE-1316] - Increase the memory limit for CLI client
+    * [HIVE-1328] - make mapred.input.dir.recursive work for select *
+    * [HIVE-1329] - for ALTER TABLE t SET TBLPROPERTIES ('EXTERNAL'='TRUE'), change TBL_TYPE attribute from MANAGED_TABLE to EXTERNAL_TABLE
+    * [HIVE-1335] - DataNucleus should use connection pooling
+    * [HIVE-1348] - Moving inputFileChanged() from ExecMapper to where it is needed
+    * [HIVE-1349] - Do not pull counters of non initialized jobs
+    * [HIVE-1355] - Hive should use NullOutputFormat for hadoop jobs
+    * [HIVE-1357] - CombineHiveInputSplit should initialize the inputFileFormat once for a single split
+    * [HIVE-1372] - New algorithm for variance() UDAF
+    * [HIVE-1383] - allow HBase WAL to be disabled
+    * [HIVE-1387] - Add PERCENTILE_APPROX which works with double data type
+    * [HIVE-1531] - Make Hive build work with Ivy versions < 2.1.0
+    * [HIVE-1543] - set abort in ExecMapper when Hive's record reader got an IOException
+    * [HIVE-1693] - Make the compile target depend on thrift.home
+
+** Task
+    * [HIVE-1081] - Automated source code cleanup
+    * [HIVE-1084] - Cleanup Class names
+    * [HIVE-1103] - Add .gitignore file
+    * [HIVE-1104] - Suppress Checkstyle warnings for generated files
+    * [HIVE-1112] - Replace instances of StringBuffer/Vector with StringBuilder/ArrayList
+    * [HIVE-1123] - Checkstyle fixes
+    * [HIVE-1135] - Use Anakia for version controlled documentation
+    * [HIVE-1137] - build references IVY_HOME incorrectly
+    * [HIVE-1147] - Update Eclipse project configuration to match Checkstyle
+    * [HIVE-1163] - Eclipse launchtemplate changes to enable debugging
+    * [HIVE-1256] - fix Hive logo img tag to avoid stretching
+    * [HIVE-1427] - Provide metastore schema migration scripts (0.5 -> 0.6)
+    * [HIVE-1709] - Provide Postgres metastore schema migration scripts (0.5 -> 0.6)
+    * [HIVE-1725] - Include metastore upgrade scripts in release tarball
+    * [HIVE-1726] - Update README file for 0.6.0 release
+    * [HIVE-1729] - Satisfy ASF release management requirements
+
+
+** Sub-task
+    * [HIVE-1340] - checking VOID type for NULL in LazyBinarySerde
+
+
+** Test
+    * [HIVE-1188] - NPE when running TestJdbcDriver/TestHiveServer
+    * [HIVE-1236] - test HBase input format plus CombinedHiveInputFormat
+    * [HIVE-1279] - temporarily disable HBase test execution
+    * [HIVE-1359] - Unit test should be shim-aware
+
+
+

Modified: hadoop/hive/branches/branch-0.6/build-common.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/build-common.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/build-common.xml (original)
+++ hadoop/hive/branches/branch-0.6/build-common.xml Tue Oct 19 22:21:47 2010
@@ -289,6 +289,7 @@
         <attribute name="Implementation-Version" value="${version}"/>
         <attribute name="Implementation-Vendor" value="Apache"/>
       </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 

Modified: hadoop/hive/branches/branch-0.6/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/build.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/build.xml Tue Oct 19 22:21:47 2010
@@ -322,6 +322,9 @@
       <fileset dir="${test.data.dir}/files" includes="*.*" excludes="${vcs.excludes}"/>
     </copy>
     <copy file="${basedir}/README.txt" todir="${target.dir}"/>
+    <copy file="${basedir}/NOTICE" todir="${target.dir}"/>
+    <copy file="${basedir}/LICENSE" todir="${target.dir}"/>
+    <copy file="${basedir}/RELEASE_NOTES.txt" todir="${target.dir}"/>
     <copy todir="${target.example.dir}/queries" preservelastmodified="true" flatten="true">
       <fileset dir="${ql.test.query.dir}/positive" includes="*.q" excludes="${vcs.excludes}"/>
     </copy>
@@ -489,6 +492,10 @@
           <include name="**"/>
           <exclude name="bin/**"/>
           <exclude name="lib/py/**/*-remote"/>
+          <!-- Exclude incomplete docs imported from wiki -->
+          <exclude name="docs/index.html"/>
+          <exclude name="docs/site.css"/>
+          <exclude name="docs/language_manual/**"/>
         </tarfileset>
         <tarfileset dir="${hive.root}" mode="664" prefix="${dev.final.name}/src"
                     excludes="${vcs.excludes}">
@@ -512,7 +519,8 @@
     </macro_tar>
   </target>
 
-  <target name="binary" depends="package, docs, javadoc" description="Make tarball without source and documentation">
+  <target name="binary" depends="package, docs, javadoc"
+          description="Make release tarball without source and documentation">
     <macro_tar param.destfile="${build.dir.hive}/${bin.final.name}.tar.gz">
       <param.listofitems>
         <tarfileset dir="${build.dir.hive}/dist" mode="755" prefix="${bin.final.name}"

Modified: hadoop/hive/branches/branch-0.6/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/contrib/build.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/contrib/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/contrib/build.xml Tue Oct 19 22:21:47 2010
@@ -122,6 +122,7 @@
         <attribute name="Implementation-Version" value="${version}"/>
         <attribute name="Implementation-Vendor" value="Apache"/>
       </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 

Modified: hadoop/hive/branches/branch-0.6/hbase-handler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/hbase-handler/build.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/hbase-handler/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/hbase-handler/build.xml Tue Oct 19 22:21:47 2010
@@ -98,6 +98,7 @@
         <attribute name="Implementation-Version" value="${version}"/>
         <attribute name="Implementation-Vendor" value="Apache"/>
       </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>
 

Modified: hadoop/hive/branches/branch-0.6/hwi/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/hwi/build.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/hwi/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/hwi/build.xml Tue Oct 19 22:21:47 2010
@@ -44,7 +44,16 @@
 
   <!--hive_hwi.war file contains only the JSP sources -->
   <target name="war">
-    <jar jarfile="${build.dir.hive}/hwi/hive-hwi-${version}.war" basedir="${basedir}/web"/>
+    <jar jarfile="${build.dir.hive}/hwi/hive-hwi-${version}.war" basedir="${basedir}/web">
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+             a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
+    </jar>
   </target>
 
   <!-- Compile is a clone of the build-common.xml compile, with one exception:

Modified: hadoop/hive/branches/branch-0.6/lib/json-LICENSE.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/lib/json-LICENSE.txt?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/lib/json-LICENSE.txt (original)
+++ hadoop/hive/branches/branch-0.6/lib/json-LICENSE.txt Tue Oct 19 22:21:47 2010
@@ -1,9 +1,22 @@
 Copyright (c) 2002 JSON.org
 
-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:
+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 above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
 The Software shall be used for Good, not Evil.
 
-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. 
+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.

Modified: hadoop/hive/branches/branch-0.6/metastore/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/metastore/build.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/metastore/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/metastore/build.xml Tue Oct 19 22:21:47 2010
@@ -82,8 +82,16 @@
     <jar
       jarfile="${build.dir}/${name}-model-${version}.jar"
       basedir="${build.classes}"
-      includes="**/model/M*"
-    />
+      includes="**/model/M*">
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+             a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
+    </jar>
   </target>
 
   <target name="generate-schema">

Modified: hadoop/hive/branches/branch-0.6/ql/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/ql/build.xml?rev=1024435&r1=1024434&r2=1024435&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/ql/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/ql/build.xml Tue Oct 19 22:21:47 2010
@@ -169,6 +169,14 @@
       <fileset dir="${build.dir.hive}/commons-lang/classes" includes="**/StringUtils.class,**/WordUtils.class"/>
       <fileset dir="${build.dir.hive}/json/classes" includes="**/*.class"/>
       <fileset dir="${build.dir.hive}/shims/classes" includes="**/*.class"/>
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+             a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+      <metainf dir="${hive.root}" includes="LICENSE,NOTICE"/>
     </jar>
   </target>