Repository: tajo
Updated Branches:
  refs/heads/master 248879fee -> 89e8fa3b8


http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..31eb031
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,317 @@
+
+                                 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.
+
+TAJO SUBCOMPONENTS:
+
+Tajo contains subcomponents with separate copyright notices and license terms.
+Your use of the source code for these subcomponents is subject to the terms
+and conditions of the following licenses.
+
+------------------------------------------------------------------------------
+For protobuf-java-format libraries 
(http://code.google.com/p/protobuf-java-format/) :
+
+Copyright 2000-2011 NeuStar, Inc. All rights reserved.
+NeuStar, the Neustar logo and related names and logos are registered
+trademarks, service marks or tradenames of NeuStar, Inc. All other
+product names, company names, marks, logos and symbols may be trademarks
+of their respective owners.
+
+Copyright (c) 2009, Orbitz World Wide
+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 Orbitz World Wide 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 jQuery libraries (http://jquery.com/) :
+
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+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 jsPlumb libraries (http://jsplumb.org/) :
+
+Copyright (c) 2013 Simon Porritt, http://jsplumb.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 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 sphinx_rtd_theme (https://github.com/snide/sphinx_rtd_theme)
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Dave Snider
+
+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.

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 31eb031..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,317 +0,0 @@
-
-                                 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.
-
-TAJO SUBCOMPONENTS:
-
-Tajo contains subcomponents with separate copyright notices and license terms.
-Your use of the source code for these subcomponents is subject to the terms
-and conditions of the following licenses.
-
-------------------------------------------------------------------------------
-For protobuf-java-format libraries 
(http://code.google.com/p/protobuf-java-format/) :
-
-Copyright 2000-2011 NeuStar, Inc. All rights reserved.
-NeuStar, the Neustar logo and related names and logos are registered
-trademarks, service marks or tradenames of NeuStar, Inc. All other
-product names, company names, marks, logos and symbols may be trademarks
-of their respective owners.
-
-Copyright (c) 2009, Orbitz World Wide
-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 Orbitz World Wide 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 jQuery libraries (http://jquery.com/) :
-
-Copyright 2013 jQuery Foundation and other contributors
-http://jquery.com/
-
-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 jsPlumb libraries (http://jsplumb.org/) :
-
-Copyright (c) 2013 Simon Porritt, http://jsplumb.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 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 sphinx_rtd_theme (https://github.com/snide/sphinx_rtd_theme)
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Dave Snider
-
-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.

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..9618522
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,10 @@
+Apache Tajo
+Copyright 2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes Protobuf-java-format 
(http://code.google.com/p/protobuf-java-format/)
+Copyright 2000-2011 NeuStar, Inc. All rights reserved.
+Copyright (c) 2009, Orbitz World Wide All rights reserved.
+Copyright 2012 Cloudera Inc.

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
deleted file mode 100644
index 9618522..0000000
--- a/NOTICE.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Apache Tajo
-Copyright 2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes Protobuf-java-format 
(http://code.google.com/p/protobuf-java-format/)
-Copyright 2000-2011 NeuStar, Inc. All rights reserved.
-Copyright (c) 2009, Orbitz World Wide All rights reserved.
-Copyright 2012 Cloudera Inc.

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/README
----------------------------------------------------------------------
diff --git a/README b/README
index 95406e9..de8671d 100644
--- a/README
+++ b/README
@@ -21,19 +21,18 @@ License
 
 Documents
 =========
-* Tajo Wiki (http://wiki.apache.org/tajo)
-* Getting Started (https://wiki.apache.org/tajo/GettingStarted)
-* Build Instruction (https://wiki.apache.org/tajo/BuildInstruction)
-* Query Language (https://wiki.apache.org/tajo/QueryLanguage)
-* Configuration Guide (https://wiki.apache.org/tajo/Configuration)
-* Backup and Restore Guide (https://wiki.apache.org/tajo/BackupAndRestore)
-* Functions (https://wiki.apache.org/tajo/Functions)
-* Tajo Interactive Shell (https://wiki.apache.org/tajo/tsql)
+* Tajo Wiki (https://cwiki.apache.org/confluence/display/TAJO)
+* Getting Started (http://tajo.apache.org/docs/current/getting_started.html)
+* Query Language (http://tajo.apache.org/docs/current/sql_language.html)
+* Configuration Guide (http://tajo.apache.org/docs/current/configuration.html)
+* Backup and Restore Guide 
(http://tajo.apache.org/docs/current/backup_and_restore.html)
+* Functions (http://tajo.apache.org/docs/current/functions.html)
+* Tajo Interactive Shell (http://tajo.apache.org/docs/current/cli.html)
 
 Requirements
 ============
 * Java 1.6 or higher
-* Hadoop 2.0.3-alpha or higher
+* Hadoop 2.2.0, 2.3.0, and 2.4.0
 
 Mailing lists
 =============

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6eea5c8..53df599 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,7 +340,7 @@
           <excludeSubProjects>false</excludeSubProjects>
           <numUnapprovedLicenses>0</numUnapprovedLicenses>
           <excludes>
-            <exclude>CHANGES.txt</exclude>
+            <exclude>CHANGES</exclude>
             <exclude>**/workers</exclude>
             <exclude>**/querymasters</exclude>
             <exclude>**/*.sql</exclude>

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/BUILDING
----------------------------------------------------------------------
diff --git a/tajo-docs/BUILDING b/tajo-docs/BUILDING
new file mode 100644
index 0000000..f460bb3
--- /dev/null
+++ b/tajo-docs/BUILDING
@@ -0,0 +1,23 @@
+========================
+Build Tajo Documentation
+========================
+
+First of all, get Sphinx from the Python as follows:
+
+  $ easy_install -U Sphinx
+
+Generate HTML docs via Maven:
+
+  $ mvn clean package
+  $ ls -l tajo-docs/target/html
+  index.html
+  ....
+  ....
+
+Generate HTML docs quickly while developing:
+
+  $ make html
+  $ ls -l tajo-docs/target/html
+  index.html
+  ....
+  ....

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/BUILDING.txt
----------------------------------------------------------------------
diff --git a/tajo-docs/BUILDING.txt b/tajo-docs/BUILDING.txt
deleted file mode 100644
index f460bb3..0000000
--- a/tajo-docs/BUILDING.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-========================
-Build Tajo Documentation
-========================
-
-First of all, get Sphinx from the Python as follows:
-
-  $ easy_install -U Sphinx
-
-Generate HTML docs via Maven:
-
-  $ mvn clean package
-  $ ls -l tajo-docs/target/html
-  index.html
-  ....
-  ....
-
-Generate HTML docs quickly while developing:
-
-  $ make html
-  $ ls -l tajo-docs/target/html
-  index.html
-  ....
-  ....

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst 
b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
index 403f8f8..d6e8186 100644
--- a/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
+++ b/tajo-docs/src/main/sphinx/configuration/catalog_configuration.rst
@@ -45,7 +45,7 @@ And then, you need to prepare MySQL JDBC driver on the 
machine which can be ran
 
   export TAJO_CLASSPATH=/usr/local/mysql/lib/mysql-connector-java-x.x.x.jar
 
-Or you just can copy jdbc driver into $TAJO_HOME/lib.
+Or you just can copy jdbc driver into ``$TAJO_HOME/lib``.
 
 Finally, you should add the following config to `conf/catalog-site.xml` :
 
@@ -80,10 +80,10 @@ First, you must compile source code and get a binary 
archive as follows:
 .. code-block:: sh
 
   $ git clone https://git-wip-us.apache.org/repos/asf/tajo.git tajo
-  $ mvn clean package -DskipTests -Pdist -Dtar -Phcatalog-0.1x.0
-  $ ls tajo-dist/target/tajo-0.8.0-SNAPSHOT.tar.gz
+  $ mvn clean install -DskipTests -Pdist -Dtar -Phcatalog-0.1x.0
+  $ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 
-Tajo support to build based on hive 0.11.0 and hive 0.12.0. If you use hive 
0.11.0, you have to set ``-Phcatalog-0.11.0``. And if you use hive 0.12.0, you 
have to set ``-Phcatalog-0.12.0``.
+Currently Tajo supports only hive 0.12.0. If you enables HCatalogStore, you 
set the maven profile as ``-Phcatalog-0.12.0``.
 
 Second, you must set your hive home directory to HIVE_HOME variable in 
``conf/tajo-env.sh`` with it as follows:
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/configuration/configuration_defaults.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/configuration/configuration_defaults.rst 
b/tajo-docs/src/main/sphinx/configuration/configuration_defaults.rst
index 5fcbe67..e3967b1 100644
--- a/tajo-docs/src/main/sphinx/configuration/configuration_defaults.rst
+++ b/tajo-docs/src/main/sphinx/configuration/configuration_defaults.rst
@@ -10,7 +10,8 @@ Tajo Master Configuration Defaults
 ============================  
==============================================================  ===========   
===============  
 Tajo Master Umbilical Rpc     tajo.master.umbilical-rpc.address                
                             localhost:26001 
 Tajo Master Client Rpc        tajo.master.client-rpc.address                   
                             localhost:26002 
-Tajo Master Info Http         tajo.master.info-http.address                    
                             0.0.0.0:26080   
+Tajo Master Info Http         tajo.master.info-http.address                    
                             0.0.0.0:26080
+Tajo Resource Tracker Rpc     tajo.resource-tracker.rpc.address                
                             localhost:26003
 Tajo Catalog Client Rpc       tajo.catalog.client-rpc.address                  
                             localhost:26005
 ============================  
==============================================================  ===========   
===============  
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst 
b/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
index 41f6e7f..2713948 100644
--- a/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
+++ b/tajo-docs/src/main/sphinx/configuration/worker_configuration.rst
@@ -57,13 +57,18 @@ In order to specify the resource capacity of each worker, 
you should add the fol
 
 .. note:: 
   
-  Currently, QueryMaster requests 512MB memory and 1.0 disk per task for the 
backward compatibility.
+  Currently, QueryMaster requests 512MB memory and 0.5 disk per task for the 
backward compatibility.
+
+.. note::
+
+  If ``tajo.worker.resource.dfs-dir-aware`` is set to ``true`` in 
``tajo-site.xml``, the worker will aware of and use the number of HDFS 
datanode's data dirs in the node.
+  In other words, ``tajo.worker.resource.disks`` is ignored.
 
 ------------
  Example
 ------------
 
-Assume that you want to give 5120 MB memory, 6.0 disks, and 24 cores on each 
worker. The example configuration is as follows:
+Assume that you want to give 5120 MB memory, 4 disks, and 24 cores on each 
worker. The example configuration is as follows:
 
 ``tajo-site.xml``
 
@@ -81,7 +86,7 @@ Assume that you want to give 5120 MB memory, 6.0 disks, and 
24 cores on each wor
   
   <property>
     <name>tajo.worker.resource.tajo.worker.resource.disks</name>
-    <value>6.0</value>
+    <value>4.0</value>
   </property>  
 
 --------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/getting_started/building.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/getting_started/building.rst 
b/tajo-docs/src/main/sphinx/getting_started/building.rst
index fbe003b..1d9fdee 100644
--- a/tajo-docs/src/main/sphinx/getting_started/building.rst
+++ b/tajo-docs/src/main/sphinx/getting_started/building.rst
@@ -11,7 +11,7 @@ You can compile source code and get a binary archive as 
follows:
 .. code-block:: bash
 
   $ cd tajo-x.y.z
-  $ mvn clean package -DskipTests -Pdist -Dtar
+  $ mvn clean install -DskipTests -Pdist -Dtar
   $ ls tajo-dist/target/tajo-x.y.z-SNAPSHOT.tar.gz
 
 Then, after you move some proper directory, discompress the tar.gz file as 
follows:

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/getting_started/downloading_source.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/getting_started/downloading_source.rst 
b/tajo-docs/src/main/sphinx/getting_started/downloading_source.rst
index c44e71a..5b4d9a8 100644
--- a/tajo-docs/src/main/sphinx/getting_started/downloading_source.rst
+++ b/tajo-docs/src/main/sphinx/getting_started/downloading_source.rst
@@ -8,13 +8,13 @@ You can get either the source code release of Apache Tajo or 
check out the devel
 Dowload the latest source release
 ================================================
 
-Choose a download site from this list of `Apache Download Mirrors 
<http://www.apache.org/dyn/closer.cgi/incubator/tajo>`_.
+Choose a download site from this list of `Apache Download Mirrors 
<http://www.apache.org/dyn/closer.cgi/tajo>`_.
 Click on the suggested mirror link. This will take you to a mirror of Tajo 
Releases. 
-Download the file that ends in .tar.gz to your local filesystem; e.g. 
tajo-0.8.0-incubating.tar.gz. 
+Download the file that ends in .tar.gz to your local filesystem; e.g. 
tajo-x.y.z-src.tar.gz.
 
 Decompress and untar your download and then change into the unpacked 
directory. ::
 
-  tar xzvf tajo-0.8.0-incubating.tar.gz
+  tar xzvf tajo-x.y.z-src.tar.gz
 
 ================================================
 Get the source code via Git

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/getting_started/first_query.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/getting_started/first_query.rst 
b/tajo-docs/src/main/sphinx/getting_started/first_query.rst
index aa5f4d2..80ee3b5 100644
--- a/tajo-docs/src/main/sphinx/getting_started/first_query.rst
+++ b/tajo-docs/src/main/sphinx/getting_started/first_query.rst
@@ -71,7 +71,7 @@ Also, you can execute SQL queries as follows: ::
   4,  jkl,  4.5,  d
   5,  mno,  5.6,  e
 
-  tajo> exit
+  tajo> \q
   bye
 
 Feel free to enjoy Tajo with SQL standards. 

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/getting_started/prerequisites.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/getting_started/prerequisites.rst 
b/tajo-docs/src/main/sphinx/getting_started/prerequisites.rst
index d4e20da..c0a5233 100644
--- a/tajo-docs/src/main/sphinx/getting_started/prerequisites.rst
+++ b/tajo-docs/src/main/sphinx/getting_started/prerequisites.rst
@@ -2,6 +2,6 @@
 Prerequisites
 **********************
 
- * Hadoop 2.2.0 or higher
+ * Hadoop 2.2.0, 2.3.0, or 2.4.0
  * Java 1.6 or higher
  * Protocol buffer 2.5.0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/index.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/index.rst 
b/tajo-docs/src/main/sphinx/index.rst
index 689561f..e6c26df 100644
--- a/tajo-docs/src/main/sphinx/index.rst
+++ b/tajo-docs/src/main/sphinx/index.rst
@@ -15,9 +15,14 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Apache Tajo™ 0.8.0 (dev) - User documentation
+Apache Tajo™ (dev) - User documentation
 ===========================================================================
 
+.. warning::
+   
+  This documentation is based on the development branch (master).
+  As a result, some contents can be mismatched to the actual implementation.
+
 Table of Contents:
 
 .. toctree::

http://git-wip-us.apache.org/repos/asf/tajo/blob/89e8fa3b/tajo-docs/src/main/sphinx/jdbc_driver.rst
----------------------------------------------------------------------
diff --git a/tajo-docs/src/main/sphinx/jdbc_driver.rst 
b/tajo-docs/src/main/sphinx/jdbc_driver.rst
index 515e509..b61d912 100644
--- a/tajo-docs/src/main/sphinx/jdbc_driver.rst
+++ b/tajo-docs/src/main/sphinx/jdbc_driver.rst
@@ -9,42 +9,49 @@ In this section, we explain how to get JDBC driver and an 
example code.
 How to get JDBC driver
 =======================
 
-Tajo provides some necesssary jar files packaged by maven. In order get the 
jar files, 
-please follow the below commands.
+From Binary Distribution
+--------------------------------
+
+Tajo binary distribution provides JDBC jar file and its dependent JAR files.
+Those files are located in ``${TAJO_HOME}/share/jdbc-dist/``.
+
+
+From Building Source Code
+--------------------------------
+
+You can build Tajo from the source code and then get JAR files as follows:
 
 .. code-block:: bash
 
-  $ cd tajo-x.y.z-incubating
+  $ tar xzvf tajo-x.y.z-src.tar.gz
   $ mvn clean package -DskipTests -Pdist -Dtar
-  $ ls -l tajo-dist/target/tajo-x.y.z-incubating/share/jdbc-dist
+  $ ls -l tajo-dist/target/tajo-x.y.z/share/jdbc-dist
 
 
 Setting the CLASSPATH
 =======================
 
 In order to use the JDBC driver, you should set the jar files included in 
-``tajo-dist/target/tajo-x.y.z-incubating/share/jdbc-dist`` to your 
``CLASSPATH``.
+``tajo-dist/target/tajo-x.y.z/share/jdbc-dist`` to your ``CLASSPATH``.
 In addition, you should add hadoop clsspath into your ``CLASSPATH``.
 So, ``CLASSPATH`` will be set as follows:
 
 .. code-block:: bash
 
-  CLASSPATH=path/to/tajo-jdbc/*:${TAJO_HOME}/conf:$(hadoop classpath)
+  
CLASSPATH=path/to/tajo-jdbc/*:path/to/tajo-site.xml:path/to/core-site.xml:path/to/hdfs-site.xml
 
 .. note::
 
-  You can get ${hadoop classpath} by executing  the command ``bin/hadoop 
classpath`` in your hadoop cluster.
+  You must add the locations which include Tajo config files (i.e., 
``tajo-site.xml``) and
+  Hadoop config files (i.e., ``core-site.xml`` and ``hdfs-site.xml``) to your 
``CLASSPATH``.
 
-.. note::
-
-  You may want to a minimal set of JAR files. If so, please refer 
:ref:`minimal_jar_files`.
 
 An Example JDBC Client
 =======================
 
 The JDBC driver class name is ``org.apache.tajo.jdbc.TajoDriver``.
-You can get the driver 
``Class.forName("org.apache.tajo.jdbc.TajoDriver").newInstance()``.
-The connection url should be ``jdbc:tajo://<TajoMaster hostname>:<TajoMaster 
client rpc port>``.
+You can get the driver ``Class.forName("org.apache.tajo.jdbc.TajoDriver")``.
+The connection url should be ``jdbc:tajo://<TajoMaster hostname>:<TajoMaster 
client rpc port>/<database name>``.
 The default TajoMaster client rpc port is ``26002``.
 If you want to change the listening port, please refer 
:doc:`/configuration/configuration_defaults`.
 
@@ -67,8 +74,14 @@ The following shows an example of JDBC Client.
     ....
 
     public static void main(String[] args) throws Exception {
-      Class.forName("org.apache.tajo.jdbc.TajoDriver").newInstance();
-      Connection conn = 
DriverManager.getConnection("jdbc:tajo://127.0.0.1:26002");
+
+      try {
+        Class.forName("org.apache.tajo.jdbc.TajoDriver");
+      } catch (ClassNotFoundException e) {
+        // fill your handling code
+      }
+
+      Connection conn = 
DriverManager.getConnection("jdbc:tajo://127.0.0.1:26002/default");
 
       Statement stmt = null;
       ResultSet rs = null;
@@ -87,50 +100,11 @@ The following shows an example of JDBC Client.
   }
 
 
-Appendix
-===========================================
-
-.. _minimal_jar_files:
-
-Minimal JAR file list
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The following JAR files are necessary minimal JAR file list.
-We've tested JDBC drivers with the following JAR files for
-usual SQL queries. But, they does not guarantee that they are 
-fully tested for all operations. So, you may need additional JAR files.
-In addition to the following JAR files, please don't forgot including
-``${HADOOP_HOME}/eta/hadoop`` and ``${TAJO_HOME}/conf`` in your ``CLASSPATH``.
-
-  * hadoop-annotations-2.2.0.jar
-  * hadoop-auth-2.2.0.jar
-  * hadoop-common-2.2.0.jar
-  * hadoop-hdfs-2.2.0.jar
-  * joda-time-2.3.jar
-  * tajo-catalog-common-0.8.0-SNAPSHOT.jar
-  * tajo-client-0.8.0-SNAPSHOT.jar
-  * tajo-common-0.8.0-SNAPSHOT.jar
-  * tajo-jdbc-0.8.0-SNAPSHOT.jar
-  * tajo-rpc-0.8.0-SNAPSHOT.jar
-  * tajo-storage-0.8.0-SNAPSHOT.jar
-  * log4j-1.2.17.jar
-  * commons-logging-1.1.1.jar
-  * guava-11.0.2.jar
-  * protobuf-java-2.5.0.jar
-  * netty-3.6.6.Final.jar
-  * commons-lang-2.5.jar
-  * commons-configuration-1.6.jar
-  * slf4j-api-1.7.5.jar
-  * slf4j-log4j12-1.7.5.jar
-  * commons-cli-1.2.jar
-  * commons-io-2.1.jar"
-
-
 FAQ
 ===========================================
 
 java.nio.channels.UnresolvedAddressException
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+--------------------------------------------
 
 When retriving the final result, Tajo JDBC Driver tries to access HDFS data 
nodes.
 So, the network access between JDBC client and HDFS data nodes must be 
available.

Reply via email to