You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/25 20:34:23 UTC
[01/39] incubator-trafodion git commit: Merge PR-451 ddl_transactions
turned on by default
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 39ae47305 -> c83055898
Merge PR-451 ddl_transactions turned on by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/78cb6b85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/78cb6b85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/78cb6b85
Branch: refs/heads/master
Commit: 78cb6b85c9b87c1dc17fb18e60edbb8be72e35c6
Parents: f0465c8 dcf6f53
Author: Anoop Sharma <an...@edev06.esgyn.local>
Authored: Tue Apr 26 21:37:55 2016 +0000
Committer: Anoop Sharma <an...@edev06.esgyn.local>
Committed: Tue Apr 26 21:37:55 2016 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/executor/ex_transaction.cpp | 7 +-
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/generator/GenPreCode.cpp | 3 +
core/sql/generator/GenRelDCL.cpp | 4 +
core/sql/regress/executor/EXPECTED013.SB | 1 -
core/sql/regress/executor/EXPECTED140 | 11 -
core/sql/regress/fullstack2/EXPECTED062 | 3 -
core/sql/regress/fullstack2/EXPECTED062.RELEASE | 3 -
core/sql/regress/seabase/EXPECTED010 | 460 ++++++++-----------
core/sql/regress/seabase/EXPECTED011 | 1 -
core/sql/regress/seabase/EXPECTED016 | 7 -
core/sql/regress/tools/sbdefs | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 4 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +-
15 files changed, 206 insertions(+), 304 deletions(-)
----------------------------------------------------------------------
[27/39] incubator-trafodion git commit: Merge branch 'release2.0' of
github.com:apache/incubator-trafodion into TRAFODION-1985
Posted by db...@apache.org.
Merge branch 'release2.0' of github.com:apache/incubator-trafodion into TRAFODION-1985
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/19b8d1f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/19b8d1f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/19b8d1f5
Branch: refs/heads/master
Commit: 19b8d1f513622fd970efb6edcbe93da833599f7b
Parents: 42b407c 8feea90
Author: Amanda Moran <am...@apache.com>
Authored: Thu May 12 16:56:05 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu May 12 16:56:05 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 34 +-
core/rest/src/assembly/all.xml | 10 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 1 +
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
22 files changed, 1967 insertions(+), 2306 deletions(-)
----------------------------------------------------------------------
[24/39] incubator-trafodion git commit: More debugging
Posted by db...@apache.org.
More debugging
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/42b407c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/42b407c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/42b407c6
Branch: refs/heads/master
Commit: 42b407c651f76adc29e37eec6eb13ad645d65ba6
Parents: 28f5114
Author: Amanda Moran <am...@apache.com>
Authored: Wed May 11 13:32:41 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed May 11 13:32:41 2016 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42b407c6/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 5ed0b44..7a63180 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -938,6 +938,7 @@ if [[ ! -z $install_features_path ]]; then
fi
fi
source $install_features_path
+ cat $install_features_path
sudo chmod 777 $TRAF_CONFIG
echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
[37/39] incubator-trafodion git commit: Merge [TRAFODION-1993] PR 482
Several fixes
Posted by db...@apache.org.
Merge [TRAFODION-1993] PR 482 Several fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9415d7f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9415d7f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9415d7f0
Branch: refs/heads/master
Commit: 9415d7f06a8c6cf9af591b23573193825e9d27fa
Parents: 6c7826c 48c419a
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 18 16:20:56 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 18 16:20:56 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 4 +++-
install/installer/rest_installer | 5 ++++-
install/installer/traf_config_check | 14 +++++++++++---
3 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[16/39] incubator-trafodion git commit: [TRAFODION-1982] Combine
server components into single tar file
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/lic-server-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-server-bin b/licenses/lic-server-bin
index 69d617f..db3e074 100644
--- a/licenses/lic-server-bin
+++ b/licenses/lic-server-bin
@@ -118,3 +118,1837 @@ available under a University of Illinois/NCSA license. (http://llvm.org/)
+++++++++++++++++++++++++++++
+The binary distribution of Apache Trafodion REST Server bundles Jettison software
+which is available under the Apache License Version 2.0 (ALv2), though developed
+outside of the ASF. https://github.com/codehaus/jettison
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion REST Server bundles Jersey Server,
+and Jersey JSON software which are available under dual CDDL1.1 and GPL2 License.
+https://jersey.java.net
+http://glassfish.java.net/public/CDDL+GPL_1_1.html
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+ 1. Definitions.
+
+ 1.1. \u201cContributor\u201d means each individual or entity that creates or contributes
+ to the creation of Modifications.
+ 1.2. \u201cContributor Version\u201d means the combination of the Original Software,
+ prior Modifications used by a Contributor (if any), and the Modifications
+ made by that particular Contributor.
+ 1.3. \u201cCovered Software\u201d means (a) the Original Software, or (b) Modifications,
+ or (c) the combination of files containing Original Software with files containing
+ Modifications, in each case including portions thereof.
+ 1.4. \u201cExecutable\u201d means the Covered Software in any form other than Source Code.
+ 1.5. \u201cInitial Developer\u201d means the individual or entity that first makes Original
+ Software available under this License.
+ 1.6. \u201cLarger Work\u201d means a work which combines Covered Software or portions
+ thereof with code not governed by the terms of this License.
+ 1.7. \u201cLicense\u201d means this document.
+ 1.8. \u201cLicensable\u201d means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently acquired, any and all of
+ the rights conveyed herein.
+ 1.9. \u201cModifications\u201d means the Source Code and Executable form of any of the
+ following:
+ A. Any file that results from an addition to, deletion from or modification of
+ the contents of a file containing Original Software or previous Modifications;
+ B. Any new file that contains any part of the Original Software or previous
+ Modification; or
+ C. Any new file that is contributed or otherwise made available under the terms
+ of this License.
+ 1.10. \u201cOriginal Software\u201d means the Source Code and Executable form of computer
+ software code that is originally released under this License.
+ 1.11. \u201cPatent Claims\u201d means any patent claim(s), now owned or hereafter acquired,
+ including without limitation, method, process, and apparatus claims, in any patent
+ Licensable by grantor.
+ 1.12. \u201cSource Code\u201d means (a) the common form of computer software code in which
+ modifications are made and (b) associated documentation included in or with such code.
+ 1.13. \u201cYou\u201d (or \u201cYour\u201d) means an individual or a legal entity exercising rights under,
+ and complying with all of the terms of, this License. For legal entities, \u201cYou\u201d
+ includes any entity which controls, is controlled by, or is under common control
+ with You. For purposes of this definition, \u201ccontrol\u201d means (a) the power, direct
+ or indirect, to cause the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty percent (50%) of the
+ outstanding shares or beneficial ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+ Conditioned upon Your compliance with Section 3.1 below and subject to third
+ party intellectual property claims, the Initial Developer hereby grants You a
+ world-wide, royalty-free, non-exclusive license:
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Initial Developer, to use, reproduce, modify, display, perform,
+ sublicense and distribute the Original Software (or portions thereof), with or
+ without Modifications, and/or as part of a Larger Work; and
+ (b) under Patent Claims infringed by the making, using or selling of Original
+ Software, to make, have made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Software (or portions thereof).
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
+ Initial Developer first distributes or otherwise makes the Original Software
+ available to a third party under the terms of this License.
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
+ (1) for code that You delete from the Original Software, or (2) for
+ infringements caused by: (i) the modification of the Original Software, or
+ (ii) the combination of the Original Software with other software or devices.
+
+ 2.2. Contributor Grant.
+ Conditioned upon Your compliance with Section 3.1 below and subject to third
+ party intellectual property claims, each Contributor hereby grants You a
+ world-wide, royalty-free, non-exclusive license:
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Contributor to use, reproduce, modify, display, perform,
+ sublicense and distribute the Modifications created by such Contributor (or
+ portions thereof), either on an unmodified basis, with other Modifications, as
+ Covered Software and/or as part of a Larger Work; and
+ (b) under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in combination with
+ its Contributor Version (or portions of such combination), to make, use, sell,
+ offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
+ by that Contributor (or portions thereof); and (2) the combination of
+ Modifications made by that Contributor with its Contributor Version (or
+ portions of such combination).
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date
+ Contributor first distributes or otherwise makes the Modifications available to
+ a third party.
+ (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
+ (1) for any code that Contributor has deleted from the Contributor
+ Version; (2) for infringements caused by: (i) third party modifications of
+ Contributor Version, or (ii) the combination of Modifications made by that
+ Contributor with other software (except as part of the Contributor Version) or
+ other devices; or (3) under Patent Claims infringed by Covered Software in the
+ absence of Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+ Any Covered Software that You distribute or otherwise make available in
+ Executable form must also be made available in Source Code form and that Source
+ Code form must be distributed only under the terms of this License. You must
+ include a copy of this License with every copy of the Source Code form of the
+ Covered Software You distribute or otherwise make available. You must inform
+ recipients of any such Covered Software in Executable form as to how they can
+ obtain such Covered Software in Source Code form in a reasonable manner on or
+ through a medium customarily used for software exchange.
+
+ 3.2. Modifications.
+ The Modifications that You create or to which You contribute are governed by the
+ terms of this License. You represent that You believe Your Modifications are
+ Your original creation(s) and/or You have sufficient rights to grant the rights
+ conveyed by this License.
+
+ 3.3. Required Notices.
+ You must include a notice in each of Your Modifications that identifies You as
+ the Contributor of the Modification. You may not remove or alter any copyright,
+ patent or trademark notices contained within the Covered Software, or any
+ notices of licensing or any descriptive text giving attribution to any
+ Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+ You may not offer or impose any terms on any Covered Software in Source
+ Code form that alters or restricts the applicable version of this License or the
+ recipients' rights hereunder. You may choose to offer, and to charge a fee for,
+ warranty, support, indemnity or liability obligations to one or more recipients
+ of Covered Software. However, you may do so only on Your own behalf, and not on
+ behalf of the Initial Developer or any Contributor. You must make it absolutely
+ clear that any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial Developer
+ and every Contributor for any liability incurred by the Initial Developer or
+ such Contributor as a result of warranty, support, indemnity or liability terms
+ You offer.
+
+ 3.5. Distribution of Executable Versions.
+ You may distribute the Executable form of the Covered Software under the terms
+ of this License or under the terms of a license of Your choice, which may
+ contain terms different from this License, provided that You are in compliance
+ with the terms of this License and that the license for the Executable form
+ does not attempt to limit or alter the recipient's rights in the Source Code
+ form from the rights set forth in this License. If You distribute the Covered
+ Software in Executable form under a different license, You must make it
+ absolutely clear that any terms which differ from this License are offered by
+ You alone, not by the Initial Developer or Contributor. You hereby agree to
+ indemnify the Initial Developer and every Contributor for any liability incurred
+ by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+ 3.6. Larger Works.
+ You may create a Larger Work by combining Covered Software with other code not
+ governed by the terms of this License and distribute the Larger Work as a single
+ product. In such a case, You must make sure the requirements of this License are
+ fulfilled for the Covered Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions.
+ Oracle is the initial license steward and may publish revised and/or new versions
+ of this License from time to time. Each version will be given a distinguishing
+ version number. Except as provided in Section 4.3, no one other than the license
+ steward has the right to modify this License.
+
+ 4.2. Effect of New Versions.
+ You may always continue to use, distribute or otherwise make the Covered Software
+ available under the terms of the version of the License under which You originally
+ received the Covered Software. If the Initial Developer includes a notice in the
+ Original Software prohibiting it from being distributed or otherwise made available
+ under any subsequent version of the License, You must distribute and make the
+ Covered Software available under the terms of the version of the License under
+ which You originally received the Covered Software. Otherwise, You may also choose
+ to use, distribute or otherwise make the Covered Software available under the
+ terms of any subsequent version of the License published by the license steward.
+
+ 4.3. Modified Versions.
+ When You are an Initial Developer and You want to create a new license for Your Original
+ Software, You may create and use a modified version of this License if You: (a)
+ rename the license and remove any references to the name of the license steward
+ (except to note that the license differs from this License); and (b) otherwise
+ make it clear that the license contains terms which differ from this License.
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN \u201cAS IS\u201d BASIS, WITHOUT
+ WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+ LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
+ MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS
+ TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+ COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER
+ OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
+ CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+ LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+ THIS DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure such
+ breach within 30 days of becoming aware of the breach. Provisions which, by
+ their nature, must remain in effect beyond the termination of this License shall
+ survive.
+
+ 6.2. If You assert a patent infringement claim (excluding declaratory
+ judgment actions) against Initial Developer or a Contributor (the Initial
+ Developer or Contributor against whom You assert such claim is referred to as
+ \u201cParticipant\u201d) alleging that the Participant Software (meaning the Contributor
+ Version where the Participant is a Contributor or the Original Software where
+ the Participant is the Initial Developer) directly or indirectly infringes any
+ patent, then any and all rights granted directly or indirectly to You by such
+ Participant, the Initial Developer (if the Initial Developer is not the
+ Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively and
+ automatically at the expiration of such 60 day notice period, unless if within
+ such 60 day period You withdraw Your claim with respect to the Participant
+ Software against such Participant either unilaterally or pursuant to a written
+ agreement with Participant.
+
+ 6.3. If You assert a patent infringement claim against Participant alleging that
+ the Participant Software directly or indirectly infringes any patent where such
+ claim is resolved (such as by license or settlement) prior to the initiation of
+ patent infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken into
+ account in determining the amount or value of any payment or license.
+
+ 6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user
+ licenses that have been validly granted by You or any distributor hereunder
+ prior to termination (excluding licenses granted to You by any distributor)
+ shall survive termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+ NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
+ CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF
+ SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
+ FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+ ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL
+ NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S
+ NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
+ JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a \u201ccommercial item,\u201d as that term is defined in 48
+ C.F.R. 2.101 (Oct. 1995), consisting of \u201ccommercial computer software\u201d (as that
+ term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and \u201ccommercial computer
+ software documentation\u201d as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
+ Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+ (June 1995), all U.S. Government End Users acquire Covered Software with only
+ those rights set forth herein. This U.S. Government Rights clause is in lieu of,
+ and supersedes, any other FAR, DFAR, or other clause or provision that addresses
+ Government rights in computer software under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter
+ hereof. If any provision of this License is held to be unenforceable, such
+ provision shall be reformed only to the extent necessary to make it enforceable.
+ This License shall be governed by the law of the jurisdiction specified in a
+ notice contained within the Original Software (except to the extent applicable
+ law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law
+ provisions. Any litigation relating to this License shall be subject to the
+ jurisdiction of the courts located in the jurisdiction and venue specified in a
+ notice contained within the Original Software, with the losing party responsible
+ for costs, including, without limitation, court costs and reasonable attorneys'
+ fees and expenses. The application of the United Nations Convention on Contracts
+ for the International Sale of Goods is expressly excluded. Any law or regulation
+ which provides that the language of a contract shall be construed against the
+ drafter shall not apply to this License. You agree that You alone are
+ responsible for compliance with the United States export administration
+ regulations (and the export control laws and regulation of any other countries)
+ when You use, distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is responsible
+ for claims and damages arising, directly or indirectly, out of its utilization
+ of rights under this License and You agree to work with Initial Developer and
+ Contributors to distribute such responsibility on an equitable basis. Nothing
+ herein is intended or shall be deemed to constitute any admission of liability.
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+ The code released under the CDDL shall be governed by the laws of the State of
+ California (excluding conflict-of-law provisions). Any litigation relating to
+ this License shall be subject to the jurisdiction of the Federal Courts of the
+ Northern District of California and the state courts of the State of California,
+ with venue lying in Santa Clara County, California.
+
+
+
+ The GNU General Public License (GPL) Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place,
+ Suite 330, Boston, MA 02111-1307 USA
+
+ Everyone is permitted to copy and distribute verbatim copies of this license
+ document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your freedom to share
+ and change it. By contrast, the GNU General Public License is intended to
+ guarantee your freedom to share and change free software--to make sure the
+ software is free for all its users. This General Public License applies to most
+ of the Free Software Foundation's software and to any other program whose
+ authors commit to using it. (Some other Free Software Foundation software is
+ covered by the GNU Library General Public License instead.) You can apply it to
+ your programs, too.
+
+ When we speak of free software, we are referring to freedom, not price. Our
+ General Public Licenses are designed to make sure that you have the freedom to
+ distribute copies of free software (and charge for this service if you wish),
+ that you receive source code or can get it if you want it, that you can change
+ the software or use pieces of it in new free programs; and that you know you can
+ do these things.
+
+ To protect your rights, we need to make restrictions that forbid anyone to
+ deny you these rights or to ask you to surrender the rights. These restrictions
+ translate to certain responsibilities for you if you distribute copies of the
+ software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether gratis or for
+ a fee, you must give the recipients all the rights that you have. You must make
+ sure that they, too, receive or can get the source code. And you must show them
+ these terms so they know their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and (2)
+ offer you this license which gives you legal permission to copy, distribute
+ and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain that
+ everyone understands that there is no warranty for this free software. If the
+ software is modified by someone else and passed on, we want its recipients to
+ know that what they have is not the original, so that any problems introduced by
+ others will not reflect on the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software patents. We
+ wish to avoid the danger that redistributors of a free program will individually
+ obtain patent licenses, in effect making the program proprietary. To prevent
+ this, we have made it clear that any patent must be licensed for everyone's free
+ use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and modification
+ follow.
+
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains a notice
+ placed by the copyright holder saying it may be distributed under the terms of
+ this General Public License. The "Program", below, refers to any such program or
+ work, and a "work based on the Program" means either the Program or any
+ derivative work under copyright law: that is to say, a work containing the
+ Program or a portion of it, either verbatim or with modifications and/or
+ translated into another language. (Hereinafter, translation is included without
+ limitation in the term "modification".) Each licensee is addressed as "you".
+
+ Activities other than copying, distribution and modification are not covered
+ by this License; they are outside its scope. The act of running the Program is
+ not restricted, and the output from the Program is covered only if its contents
+ constitute a work based on the Program (independent of having been made by
+ running the Program). Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's source code as
+ you receive it, in any medium, provided that you conspicuously and appropriately
+ publish on each copy an appropriate copyright notice and disclaimer of warranty;
+ keep intact all the notices that refer to this License and to the absence of any
+ warranty; and give any other recipients of the Program a copy of this License
+ along with the Program.
+
+ You may charge a fee for the physical act of transferring a copy, and you may
+ at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion of it,
+ thus forming a work based on the Program, and copy and distribute such
+ modifications or work under the terms of Section 1 above, provided that you also
+ meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating that
+ you changed the files and the date of any change.
+ b) You must cause any work that you distribute or publish, that in whole or
+ in part contains or is derived from the Program or any part thereof, to be
+ licensed as a whole at no charge to all third parties under the terms of this License.
+ c) If the modified program normally reads commands interactively when run, you must
+ cause it, when started running for such interactive use in the most ordinary
+ way, to print or display an announcement including an appropriate copyright
+ notice and a notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under these conditions,
+ and telling the user how to view a copy of this License. (Exception: if the
+ Program itself is interactive but does not normally print such an announcement,
+ your work based on the Program is not required to print an announcement.)
+
+ These requirements apply to the modified work as a whole. If identifiable sections
+ of that work are not derived from the Program, and can be reasonably considered
+ independent and separate works in themselves, then this License, and its terms, do
+ not apply to those sections when you distribute them as separate works. But when you
+ distribute the same sections as part of a whole which is a work based on the
+ Program, the distribution of the whole must be on the terms of this License,
+ whose permissions for other licensees extend to the entire whole, and thus to
+ each and every part regardless of who wrote it.
+
+ Thus, it is not the intent of this section to claim rights or contest your
+ rights to work written entirely by you; rather, the intent is to exercise the
+ right to control the distribution of derivative or collective works based on the
+ Program.
+
+ In addition, mere aggregation of another work not based on the Program with
+ the Program (or with a work based on the Program) on a volume of a storage or
+ distribution medium does not bring the other work under the scope of this
+ License.
+
+ 3. You may copy and distribute the Program (or a work based on it, under
+ Section 2) in object code or executable form under the terms of Sections 1 and 2
+ above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source code,
+ which must be distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+ b) Accompany it with a written offer, valid for at least three years, to give
+ any third party, for a charge no more than your cost of physically performing
+ source distribution, a complete machine-readable copy of the corresponding source
+ code, to be distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+ c) Accompany it with the information you received as to the offer to distribute
+ corresponding source code. (This alternative is allowed only for noncommercial
+ distribution and only if you received the program in object code or executable
+ form with such an offer, in accord with Subsection b above.)
+
+ The source code for a work means the preferred form of the work for making
+ modifications to it. For an executable work, complete source code means all the
+ source code for all modules it contains, plus any associated interface
+ definition files, plus the scripts used to control compilation and installation
+ of the executable. However, as a special exception, the source code distributed
+ need not include anything that is normally distributed (in either source or
+ binary form) with the major components (compiler, kernel, and so on) of the
+ operating system on which the executable runs, unless that component itself
+ accompanies the executable.
+
+ If distribution of executable or object code is made by offering access to
+ copy from a designated place, then offering equivalent access to copy the source
+ code from the same place counts as distribution of the source code, even though
+ third parties are not compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program except as
+ expressly provided under this License. Any attempt otherwise to copy, modify,
+ sublicense or distribute the Program is void, and will automatically terminate
+ your rights under this License. However, parties who have received copies, or
+ rights, from you under this License will not have their licenses terminated so
+ long as such parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not signed it.
+ However, nothing else grants you permission to modify or distribute the Program
+ or its derivative works. These actions are prohibited by law if you do not
+ accept this License. Therefore, by modifying or distributing the Program (or any
+ work based on the Program), you indicate your acceptance of this License to do
+ so, and all its terms and conditions for copying, distributing or modifying the
+ Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the Program),
+ the recipient automatically receives a license from the original licensor to
+ copy, distribute or modify the Program subject to these terms and conditions.
+ You may not impose any further restrictions on the recipients' exercise of the
+ rights granted herein. You are not responsible for enforcing compliance by third
+ parties to this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+ infringement or for any other reason (not limited to patent issues), conditions
+ are imposed on you (whether by court order, agreement or otherwise) that
+ contradict the conditions of this License, they do not excuse you from the
+ conditions of this License. If you cannot distribute so as to satisfy
+ simultaneously your obligations under this License and any other pertinent
+ obligations, then as a consequence you may not distribute the Program at all.
+ For example, if a patent license would not permit royalty-free redistribution of
+ the Program by all those who receive copies directly or indirectly through you,
+ then the only way you could satisfy both it and this License would be to refrain
+ entirely from distribution of the Program.
+
+ If any portion of this section is held invalid or unenforceable under any
+ particular circumstance, the balance of the section is intended to apply and the
+ section as a whole is intended to apply in other circumstances.
+
+ It is not the purpose of this section to induce you to infringe any patents or
+ other property right claims or to contest validity of any such claims; this
+ section has the sole purpose of protecting the integrity of the free software
+ distribution system, which is implemented by public license practices. Many
+ people have made generous contributions to the wide range of software
+ distributed through that system in reliance on consistent application of that
+ system; it is up to the author/donor to decide if he or she is willing to
+ distribute software through any other system and a licensee cannot impose that
+ choice.
+
+ This section is intended to make thoroughly clear what is believed to be a
+ consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in certain
+ countries either by patents or by copyrighted interfaces, the original copyright
+ holder who places the Program under this License may add an explicit
+ geographical distribution limitation excluding those countries, so that
+ distribution is permitted only in or among countries not thus excluded. In such
+ case, this License incorporates the limitation as if written in the body of this
+ License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions of the
+ General Public License from time to time. Such new versions will be similar in
+ spirit to the present version, but may differ in detail to address new problems
+ or concerns.
+
+ Each version is given a distinguishing version number. If the Program
+ specifies a version number of this License which applies to it and "any later
+ version", you have the option of following the terms and conditions either of
+ that version or of any later version published by the Free Software Foundation.
+ If the Program does not specify a version number of this License, you may choose
+ any version ever published by the Free Software Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free programs
+ whose distribution conditions are different, write to the author to ask for
+ permission. For software which is copyrighted by the Free Software Foundation,
+ write to the Free Software Foundation; we sometimes make exceptions for this.
+ Our decision will be guided by the two goals of preserving the free status of
+ all derivatives of our free software and of promoting the sharing and reuse of
+ software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+ THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+ STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+ "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+ PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+ PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+ SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
+ TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+ RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+ THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+ PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+ Certain source files distributed by Oracle are subject to the following
+ clarification and special exception to the GPL Version 2, but only where Oracle
+ has expressly included in the particular source file's header the words "Oracle
+ designates this particular file as subject to the "Classpath" exception as
+ provided by Oracle in the License file that accompanied this code."
+
+ Linking this library statically or dynamically with other modules is making a
+ combined work based on this library. Thus, the terms and conditions of the GNU
+ General Public License Version 2 cover the whole combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules, and to
+ copy and distribute the resulting executable under terms of your choice,
+ provided that you also meet, for each linked independent module, the terms and
+ conditions of the license of that module. An independent module is a module
+ which is not derived from or based on this library. If you modify this library,
+ you may extend this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this exception
+ statement from your version.
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion REST Server bundles Java Servlet API
+software which is available under dual CDDL1.0 and GPL2 License.
+https://java.net/projects/servlet-spec
+https://glassfish.java.net/nonav/public/CDDL+GPL.html
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+ 1. Definitions.
+
+ 1.1. \u201cContributor\u201d means each individual or entity that creates or contributes
+ to the creation of Modifications.
+
+ 1.2. \u201cContributor Version\u201d means the combination of the Original Software,
+ prior Modifications used by a Contributor (if any), and the Modifications made
+ by that particular Contributor.
+
+ 1.3. \u201cCovered Software\u201d means (a) the Original Software, or (b) Modifications,
+ or (c) the combination of files containing Original Software with files
+ containing Modifications, in each case including portions thereof.
+
+ 1.4. \u201cExecutable\u201d means the Covered Software in any form other than Source Code.
+
+ 1.5. \u201cInitial Developer\u201d means the individual or entity that first makes
+ Original Software available under this License.
+
+ 1.6. \u201cLarger Work\u201d means a work which combines Covered Software or portions
+ thereof with code not governed by the terms of this License.
+
+ 1.7. \u201cLicense\u201d means this document.
+
+ 1.8. \u201cLicensable\u201d means having the right to grant, to the maximum extent
+ possible, whether at the time of the initial grant or subsequently acquired, any
+ and all of the rights conveyed herein.
+
+ 1.9. \u201cModifications\u201d means the Source Code and Executable form of any of the
+ following:
+
+ A. Any file that results from an addition to, deletion from or modification of
+ the contents of a file containing Original Software or previous Modifications;
+
+ B. Any new file that contains any part of the Original Software or previous
+ Modification; or
+
+ C. Any new file that is contributed or otherwise made available under the
+ terms of this License.
+
+ 1.10. \u201cOriginal Software\u201d means the Source Code and Executable form of
+ computer software code that is originally released under this License.
+
+ 1.11. \u201cPatent Claims\u201d means any patent claim(s), now owned or hereafter
+ acquired, including without limitation, method, process, and apparatus claims,
+ in any patent Licensable by grantor.
+
+ 1.12. \u201cSource Code\u201d means (a) the common form of computer software code in
+ which modifications are made and (b) associated documentation included in or
+ with such code.
+
+ 1.13. \u201cYou\u201d (or \u201cYour\u201d) means an individual or a legal entity exercising
+ rights under, and complying with all of the terms of, this License. For legal
+ entities, \u201cYou\u201d includes any entity which controls, is controlled by, or is
+ under common control with You. For purposes of this definition, \u201ccontrol\u201d means
+ (a) the power, direct or indirect, to cause the direction or management of such
+ entity, whether by contract or otherwise, or (b) ownership of more than fifty
+ percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to third
+ party intellectual property claims, the Initial Developer hereby grants You a
+ world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Initial Developer, to use, reproduce, modify, display, perform,
+ sublicense and distribute the Original Software (or portions thereof), with or
+ without Modifications, and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using or selling of Original
+ Software, to make, have made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Software (or portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
+ Initial Developer first distributes or otherwise makes the Original Software
+ available to a third party under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1)
+ for code that You delete from the Original Software, or (2) for infringements
+ caused by: (i) the modification of the Original Software, or (ii) the
+ combination of the Original Software with other software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and subject to third
+ party intellectual property claims, each Contributor hereby grants You a
+ world-wide, royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by Contributor to use, reproduce, modify, display, perform,
+ sublicense and distribute the Modifications created by such Contributor (or
+ portions thereof), either on an unmodified basis, with other Modifications, as
+ Covered Software and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or selling of
+ Modifications made by that Contributor either alone and/or in combination with
+ its Contributor Version (or portions of such combination), to make, use, sell,
+ offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
+ by that Contributor (or portions thereof); and (2) the combination of
+ Modifications made by that Contributor with its Contributor Version (or portions
+ of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
+ date Contributor first distributes or otherwise makes the Modifications
+ available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1)
+ for any code that Contributor has deleted from the Contributor Version; (2) for
+ infringements caused by: (i) third party modifications of Contributor Version,
+ or (ii) the combination of Modifications made by that Contributor with other
+ software (except as part of the Contributor Version) or other devices; or (3)
+ under Patent Claims infringed by Covered Software in the absence of
+ Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+
+ Any Covered Software that You distribute or otherwise make available in
+ Executable form must also be made available in Source Code form and that Source
+ Code form must be distributed only under the terms of this License. You must
+ include a copy of this License with every copy of the Source Code form of the
+ Covered Software You distribute or otherwise make available. You must inform
+ recipients of any such Covered Software in Executable form as to how they can
+ obtain such Covered Software in Source Code form in a reasonable manner on or
+ through a medium customarily used for software exchange.
+
+ 3.2. Modifications.
+
+ The Modifications that You create or to which You contribute are governed by
+ the terms of this License. You represent that You believe Your Modifications are
+ Your original creation(s) and/or You have sufficient rights to grant the rights
+ conveyed by this License.
+
+ 3.3. Required Notices.
+
+ You must include a notice in each of Your Modifications that identifies You as
+ the Contributor of the Modification. You may not remove or alter any copyright,
+ patent or trademark notices contained within the Covered Software, or any
+ notices of licensing or any descriptive text giving attribution to any
+ Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+
+ You may not offer or impose any terms on any Covered Software in Source Code
+ form that alters or restricts the applicable version of this License or the
+ recipients\u2019 rights hereunder. You may choose to offer, and to charge a fee for,
+ warranty, support, indemnity or liability obligations to one or more recipients
+ of Covered Software. However, you may do so only on Your own behalf, and not on
+ behalf of the Initial Developer or any Contributor. You must make it absolutely
+ clear that any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial Developer
+ and every Contributor for any liability incurred by the Initial Developer or
+ such Contributor as a result of warranty, support, indemnity or liability terms
+ You offer.
+
+ 3.5. Distribution of Executable Versions.
+
+ You may distribute the Executable form of the Covered Software under the terms
+ of this License or under the terms of a license of Your choice, which may
+ contain terms different from this License, provided that You are in compliance
+ with the terms of this License and that the license for the Executable form does
+ not attempt to limit or alter the recipient\u2019s rights in the Source Code form
+ from the rights set forth in this License. If You distribute the Covered
+ Software in Executable form under a different license, You must make it
+ absolutely clear that any terms which differ from this License are offered by
+ You alone, not by the Initial Developer or Contributor. You hereby agree to
+ indemnify the Initial Developer and every Contributor for any liability incurred
+ by the Initial Developer or such Contributor as a result of any such terms You
+ offer.
+
+ 3.6. Larger Works.
+
+ You may create a Larger Work by combining Covered Software with other code not
+ governed by the terms of this License and distribute the Larger Work as a single
+ product. In such a case, You must make sure the requirements of this License are
+ fulfilled for the Covered Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions.
+
+ Sun Microsystems, Inc. is the initial license steward and may publish revised
+ and/or new versions of this License from time to time. Each version will be
+ given a distinguishing version number. Except as provided in Section 4.3, no one
+ other than the license steward has the right to modify this License.
+
+ 4.2. Effect of New Versions.
+
+ You may always continue to use, distribute or otherwise make the Covered
+ Software available under the terms of the version of the License under which You
+ originally received the Covered Software. If the Initial Developer includes a
+ notice in the Original Software prohibiting it from being distributed or
+ otherwise made available under any subsequent version of the License, You must
+ distribute and make the Covered Software available under the terms of the
+ version of the License under which You originally received the Covered Software.
+ Otherwise, You may also choose to use, distribute or otherwise make the Covered
+ Software available under the terms of any subsequent version of the License
+ published by the license steward.
+
+ 4.3. Modified Versions.
+
+ When You are an Initial Developer and You want to create a new license for
+ Your Original Software, You may create and use a modified version of this
+ License if You: (a) rename the license and remove any references to the name of
+ the license steward (except to note that the license differs from this License);
+ and (b) otherwise make it clear that the license contains terms which differ
+ from this License.
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN \u201cAS IS\u201d BASIS, WITHOUT
+ WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+ LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
+ MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS
+ TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+ COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER
+ OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
+ CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
+ LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+ THIS DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure such
+ breach within 30 days of becoming aware of the breach. Provisions which, by
+ their nature, must remain in effect beyond the termination of this License shall
+ survive.
+
+ 6.2. If You assert a patent infringement claim (excluding declaratory judgment
+ actions) against Initial Developer or a Contributor (the Initial Developer or
+ Contributor against whom You assert such claim is referred to as \u201cParticipant\u201d)
+ alleging that the Participant Software (meaning the Contributor Version where
+ the Participant is a Contributor or the Original Software where the Participant
+ is the Initial Developer) directly or indirectly infringes any patent, then any
+ and all rights granted directly or indirectly to You by such Participant, the
+ Initial Developer (if the Initial Developer is not the Participant) and all
+ Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
+ notice from Participant terminate prospectively and automatically at the
+ expiration of such 60 day notice period, unless if within such 60 day period You
+ withdraw Your claim with respect to the Participant Software against such
+ Participant either unilaterally or pursuant to a written agreement with
+ Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user
+ licenses that have been validly granted by You or any distributor hereunder
+ prior to termination (excluding licenses granted to You by any distributor)
+ shall survive termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+ NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
+ CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF
+ SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
+ FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
+ MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH
+ PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS
+ LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+ INJURY RESULTING FROM SUCH PARTY\u2019S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+ LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
+ LIMITATION MAY NOT APPLY TO YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a \u201ccommercial item,\u201d as that term is defined in 48
+ C.F.R. 2.101 (Oct. 1995), consisting of \u201ccommercial computer software\u201d (as that
+ term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and \u201ccommercial computer
+ software documentation\u201d as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
+ Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+ (June 1995), all U.S. Government End Users acquire Covered Software with only
+ those rights set forth herein. This U.S. Government Rights clause is in lieu of,
+ and supersedes, any other FAR, DFAR, or other clause or provision that addresses
+ Government rights in computer software under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject matter
+ hereof. If any provision of this License is held to be unenforceable, such
+ provision shall be reformed only to the extent necessary to make it enforceable.
+ This License shall be governed by the law of the jurisdiction specified in a
+ notice contained within the Original Software (except to the extent applicable
+ law, if any, provides otherwise), excluding such jurisdiction\u2019s conflict-of-law
+ provisions. Any litigation relating to this License shall be subject to the
+ jurisdiction of the courts located in the jurisdiction and venue specified in a
+ notice contained within the Original Software, with the losing party responsible
+ for costs, including, without limitation, court costs and reasonable attorneys\u2019
+ fees and expenses. The application of the United Nations Convention on Contracts
+ for the International Sale of Goods is expressly excluded. Any law or regulation
+ which provides that the language of a contract shall be construed against the
+ drafter shall not apply to this License. You agree that You alone are
+ responsible for compliance with the United States export administration
+ regulations (and the export control laws and regulation of any other countries)
+ when You use, distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is responsible
+ for claims and damages arising, directly or indirectly, out of its utilization
+ of rights under this License and You agree to work with Initial Developer and
+ Contributors to distribute such responsibility on an equitable basis. Nothing
+ herein is intended or shall be deemed to constitute any admission of liability.
+
+ NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+ The code released under the CDDL shall be governed by the laws of the State of
+ California (excluding conflict-of-law provisions). Any litigation relating to
+ this License shall be subject to the jurisdiction of the Federal Courts of the
+ Northern District of California and the state courts of the State of California,
+ with venue lying in Santa Clara County, California.
+
+ The GNU General Public License (GPL) Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite
+ 330, Boston, MA 02111-1307 USA
+
+ Everyone is permitted to copy and distribute verbatim copies of this license
+ document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your freedom to share
+ and change it. By contrast, the GNU General Public License is intended to
+ guarantee your freedom to share and change free software--to make sure the
+ software is free for all its users. This General Public License applies to most
+ of the Free Software Foundation's software and to any other program whose
+ authors commit to using it. (Some other Free Software Foundation software is
+ covered by the GNU Library General Public License instead.) You can apply it to
+ your programs, too.
+
+ When we speak of free software, we are referring to freedom, not price. Our
+ General Public Licenses are designed to make sure that you have the freedom to
+ distribute copies of free software (and charge for this service if you wish),
+ that you receive source code or can get it if you want it, that you can change
+ the software or use pieces of it in new free programs; and that you know you can
+ do these things.
+
+ To protect your rights, we need to make restrictions that forbid anyone to
+ deny you these rights or to ask you to surrender the rights. These restrictions
+ translate to certain responsibilities for you if you distribute copies of the
+ software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether gratis or for
+ a fee, you must give the recipients all the rights that you have. You must make
+ sure that they, too, receive or can get the source code. And you must show them
+ these terms so they know their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and (2)
+ offer you this license which gives you legal permission to copy, distribute
+ and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain that
+ everyone understands that there is no warranty for this free software. If the
+ software is modified by someone else and passed on, we want its recipients to
+ know that what they have is not the original, so that any problems introduced by
+ others will not reflect on the original authors' reputations.
+
+ Finally, any free program is threatened constantly by software patents. We
+ wish to avoid the danger that redistributors of a free program will individually
+ obtain patent licenses, in effect making the program proprietary. To prevent
+ this, we have made it clear that any patent must be licensed for everyone's free
+ use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and modification
+ follow.
+
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains a notice
+ placed by the copyright holder saying it may be distributed under the terms of
+ this General Public License. The "Program", below, refers to any such program or
+ work, and a "work based on the Program" means either the Program or any
+ derivative work under copyright law: that is to say, a work containing the
+ Program or a portion of it, either verbatim or with modifications and/or
+ translated into another language. (Hereinafter, translation is included without
+ limitation in the term "modification".) Each licensee is addressed as "you".
+
+ Activities other than copying, distribution and modification are not covered
+ by this License; they are outside its scope. The act of running the Program is
+ not restricted, and the output from the Program is covered only if its contents
+ constitute a work based on the Program (independent of having been made by
+ running the Program). Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's source code as
+ you receive it, in any medium, provided that you conspicuously and appropriately
+ publish on each copy an appropriate copyright notice and disclaimer of warranty;
+ keep intact all the notices that refer to this License and to the absence of any
+ warranty; and give any other recipients of the Program a copy of this License
+ along with the Program.
+
+ You may charge a fee for the physical act of transferring a copy, and you may
+ at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion of it,
+ thus forming a work based on the Program, and copy and distribute such
+ modifications or work under the terms of Section 1 above, provided that you also
+ meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating that
+ you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole or in
+ part contains or is derived from the Program or any part thereof, to be licensed
+ as a whole at no charge to all third parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively when run, you
+ must cause it, when started running for such interactive use in the most
+ ordinary way, to print or display an announcement including an appropriate
+ copyright notice and a notice that there is no warranty (or else, saying that
+ you provide a warranty) and that users may redistribute the program under these
+ conditions, and telling the user how to view a copy of this License. (Exception:
+ if the Program itself is interactive but does not normally print such an
+ announcement, your work based on the Program is not required to print an
+ announcement.)
+
+ These requirements apply to the modified work as a whole. If identifiable
+ sections of that work are not derived from the Program, and can be reasonably
+ considered independent and separate works in themselves, then this License, and
+ its terms, do not apply to those sections when you distribute them as separate
+ works. But when you distribute the same sections as part of a whole which is a
+ work based on the Program, the distribution of the whole must be on the terms of
+ this License, whose permissions for other licensees extend to the entire whole,
+ and thus to each and every part regardless of who wrote it.
+
+ Thus, it is not the intent of this section to claim rights or contest your
+ rights to work written entirely by you; rather, the intent is to exercise the
+ right to control the distribution of derivative or collective works based on the
+ Program.
+
+ In addition, mere aggregation of another work not based on the Program with
+ the Program (or with a work based on the Program) on a volume of a storage or
+ distribution medium does not bring the other work under the scope of this
+ License.
+
+ 3. You may copy and distribute the Program (or a work based on it, under
+ Section 2) in object code or executable form under the terms of Sections 1 and 2
+ above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source code,
+ which must be distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to give
+ any third party, for a charge no more than your cost of physically performing
+ source distribution, a complete machine-readable copy of the corresponding
+ source code, to be distributed under the terms of Sections 1 and 2 above on a
+ medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to
+ distribute corresponding source code. (This alternative is allowed only for
+ noncommercial distribution and only if you received the program in object code
+ or executable form with such an offer, in accord with Subsection b above.)
+
+ The source code for a work means the preferred form of the work for making
+ modifications to it. For an executable work, complete source code means all the
+ source code for all modules it contains, plus any associated interface
+ definition files, plus the scripts used to control compilation and installation
+ of the executable. However, as a special exception, the source code distributed
+ need not include anything that is normally distributed (in either source or
+ binary form) with the major components (compiler, kernel, and so on) of the
+ operating system on which the executable runs, unless that component itself
+ accompanies the executable.
+
+ If distribution of executable or object code is made by offering access to
+ copy from a designated place, then offering equivalent access to copy the source
+ code from the same place counts as distribution of the source code, even though
+ third parties are not compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program except as
+ expressly provided under this License. Any attempt otherwise to copy, modify,
+ sublicense or distribute the Program is void, and will automatically terminate
+ your rights under this License. However, parties who have received copies, or
+ rights, from you under this License will not have their licenses terminated so
+ long as such parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not signed it.
+ However, nothing else grants you permission to modify or distribute the Program
+ or its derivative works. These actions are prohibited by law if you do not
+ accept this License. Therefore, by modifying or distributing the Program (or any
+ work based on the Program), you indicate your acceptance of this License to do
+ so, and all its terms and conditions for copying, distributing or modifying the
+ Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the Program),
+ the recipient automatically receives a license from the original licensor to
+ copy, distribute or modify the Program subject to these terms and conditions.
+ You may not impose any further restrictions on the recipients' exercise of the
+ rights granted herein. You are not responsible for enforcing compliance by third
+ parties to this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+ infringement or for any other reason (not limited to patent issues), conditions
+ are imposed on you (whether by court order, agreement or otherwise) that
+ contradict the conditions of this License, they do not excuse you from the
+ conditions of this License. If you cannot distribute so as to satisfy
+ simultaneously your obligations under this License and any other pertinent
+ obligations, then as a consequence you may not distribute the Program at all.
+ For example, if a patent license would not permit royalty-free redistribution of
+ the Program by all those who receive copies directly or indirectly through you,
+ then the only way you could satisfy both it and this License would be to refrain
+ entirely from distribution of the Program.
+
+ If any portion of this section is held invalid or unenforceable under any
+ particular circumstance, the balance of the section is intended to apply and the
+ section as a whole is intended to apply in other circumstances.
+
+ It is not the purpose of this section to induce you to infringe any patents or
+ other property right claims or to contest validity of any such claims; this
+ section has the sole purpose of protecting the integrity of the free software
+ distribution system, which is implemented by public license practices. Many
+ people have made generous contributions to the wide range of software
+ distributed through that system in reliance on consistent application of that
+ system; it is up to the author/donor to decide if he or she is willing to
+ distribute software through any other system and a licensee cannot impose that
+ choice.
+
+ This section is intended to make thoroughly clear what is believed to be a
+ consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in certain
+ countries either by patents or by copyrighted interfaces, the original copyright
+ holder who places the Program under this License may add an explicit
+ geographical distribution limitation excluding those countries, so that
+ distribution is permitted only in or among countries not thus excluded. In such
+ case, this License incorporates the limitation as if written in the body of this
+ License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions of the
+ General Public License from time to time. Such new versions will be similar in
+ spirit to the present version, but may differ in detail to address new problems
+ or concerns.
+
+ Each version is given a distinguishing version number. If the Program
+ specifies a version number of this License which applies to it and "any later
+ version", you have the option of following the terms and conditions either of
+ that version or of any later version published by the Free Software Foundation.
+ If the Program does not specify a version number of this License, you may choose
+ any version ever published by the Free Software Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free programs
+ whose distribution conditions are different, write to the author to ask for
+ permission. For software which is copyrighted by the Free Software Foundation,
+ write to the Free Software Foundation; we sometimes make exceptions for this.
+ Our decision will be guided by the two goals of preserving the free status of
+ all derivatives of our free software and of promoting the sharing and reuse of
+ software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+ THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+ STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
+ "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+ PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+ PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+ SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
+ TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+ RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+ THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+ PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+ Certain source files distributed by Sun Microsystems, Inc. are subject to the
+ following clarification and special exception to the GPL Version 2, but only
+ where Sun has expressly included in the particular source file's header the
+ words "Sun designates this particular file as subject to the "Classpath"
+ exception as provided by Sun in the License file that accompanied this code."
+
+ Linking this library statically or dynamically with other modules is making a
+ combined work based on this library. Thus, the terms and conditions of the GNU
+ General Public License Version 2 cover the whole combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent modules, and to
+ copy and distribute the resulting executable under terms of your choice,
+ provided that you also meet, for each linked independent module, the terms and
+ conditions of the license of that module.? An independent module is a module
+ which is not derived from or based on this library.? If you modify this library,
+ you may extend this exception to your version of the library, but you are not
+ obligated to do so.? If you do not wish to do so, delete this exception
+ statement from your version.
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion DCS and REST components bundle Jetty software
+which is available under the Apache License Version 2.0 (ALv2), though developed
+outside of the ASF. The bundled software includes Jetty Server, Jetty Utilities, and
+Glassfish Jasper API (JSP2.1 API). http://www.eclipse.org/jetty/
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion DCS and REST components bundle
+SLF4J (Simple Logging Facade for Java) software which is available under the
+MIT/X11 License. http://www.slf4j.org
+
+ Copyright (c) 2004-2013 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.
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion DCS bundles Display Tag Library
+software which is available under the Artistic License.
+http://displaytag.sf.net
+
+ The Artistic License
+
+ Preamble
+
+ The intent of this document is to state the conditions under which a
+ Package may be copied, such that the Copyright Holder maintains some
+ semblance of artistic control over the development of the package,
+ while giving the users of the package the right to use and distribute
+ the Package in a more-or-less customary fashion, plus the right to make
+ reasonable modifications.
+
+ "Package" refers to the collection of files distributed by the
+ Copyright Holder, and derivatives of that collection of files
+ created through textual modification.
+
+ "Standard Version" refers to such a Package if it has not been
+ modified, or has been modified in accordance with the wishes
+ of the Copyright Holder.
+
+ "Copyright Holder" is whoever is named in the copyright or
+ copyrights for the package.
+
+ "You" is you, if you're thinking about copying or distributing
+ this Package.
+
+ "Reasonable copying fee" is whatever you can justify on the
+ basis of media cost, duplication charges, time of people involved,
+ and so on. (You will not be required to justify it to the
+ Copyright Holder, but only to the computing community at large
+ as a market that must bear the fee.)
+
+ "Freely Available" means that no fee is charged for the item
+ itself, though there may be fees involved in handling the item.
+ It also means that recipients of the item may redistribute it
+ under the same conditions they received it.
+
+
+ 1. You may make and give away verbatim copies of the source form of the
+ Standard Version of this Package without restriction, provided that you
+ duplicate all of the original copyright notices and associated disclaimers.
+
+
+ 2. You may apply bug fixes, portability fixes and other modifications
+ derived from the Public Domain or from the Copyright Holder. A Package
+ modified in such a way shall still be considered the Standard Version.
+
+
+ 3. You may otherwise modify your copy of this Package in any way, provided
+ that you insert a prominent notice in each changed file stating how and
+ when you changed that file, and provided that you do at least ONE of the
+ following:
+
+ a) place your modifications in the Public Domain or otherwise make them
+ Freely Available, such as by posting said modifications to Usenet or
+ an equivalent medium, or placing the modifications on a major archive
+ site such as ftp.uu.net, or by allowing the Copyright Holder to include
+ your modifications in the Standard Version of the Package.
+
+ b) use the modified Package only within your corporation or organization.
+
+ c) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided, and provide
+ a separate manual page for each non-standard executable that clearly
+ documents how it differs from the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+
+ 4. You may distribute the programs of this Package in object code or
+ executable form, provided that you do at least ONE of the following:
+
+ a) distribute a Standard Version of the executables and library files,
+ together with instructions (in the manual page or equivalent) on where
+ to get the Standard Version.
+
+ b) accompany the distribution with the machine-readable source of
+ the Package with your modifications.
+
+ c) accompany any non-standard executables with their corresponding
+ Standard Version executables, giving the non-standard executables
+ non-standard names, and clearly documenting the differences in manual
+ pages (or equivalent), together with instructions on where to get
+ the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+
+ 5. You may charge a reasonable copying fee for any distribution of this
+ Package. You may charge any fee you choose for support of this Package.
+ You may not charge a fee for this Package itself. However,
+ you may distribute this Package in aggregate with other (possibly
+ commercial) programs as part of a larger (possibly commercial) software
+ distribution provided that you do not advertise this Package as a
+ product of your own.
+
+
+ 6. The scripts and library files supplied as input to or produced as
+ output from the programs of this Package do not automatically fall
+ under the copyright of this Package, but belong to whomever generated
+ them, and may be sold commercially, and may be aggregated with this
+ Package.
+
+
+ 7. C or perl subroutines supplied by you and linked into this Package
+ shall not be considered part of this Package.
+
+
+ 8. The name of the Copyright Holder may not be used to endorse or promote
+ products derived from this software without specific prior written permission.
+
+
+ 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+ The End
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion DCS and REST components bundle Jython Standalone
+software which is available under the Python Software License.
+http://www.jython.org
+
+ ====================================
+ The Jython License
+ ====================================
+
+
+ A. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
+ ==============================================================================================================
+
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ ----------------------------------------------------------------------------------------
+
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Jython") in source or binary form and
+ its associated documentation.
+
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Jython alone
+ or in any derivative version, provided, however, that PSF's License
+ Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2007
+ Python Software Foundation; All Rights Reserved" are retained in
+ Jython alone or in any derivative version prepared by Licensee.
+
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Jython or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Jython.
+
+ 4. PSF is making Jython available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF JYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+
+ 8. By copying, installing or otherwise using Jython, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+
+ Jython 2.0, 2.1 License
+ --------------------------------------------
+
+ Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
+ 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 Jython Developers 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 REGENTS 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.
+
+
+
+
+ JPython 1.1.x Software License.
+ ______________________________________________________________________
+
+ 1. This LICENSE AGREEMENT is between the Corporation for National Research
+ Initiatives, having an office at 1895 Preston White Drive, Reston, VA
+ 20191 ("CNRI"), and the Individual or Organization ("Licensee")
+ accessing and using JPython version 1.1.x in source or binary form and
+ its associated documentation as provided herein ("Software").
+
+ 2. Subject to the terms and conditions of this License Agreement, CNRI
+ hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
+ world-wide license to reproduce, analyze, test, perform and/or display
+ publicly, prepare derivative works, distribute, and otherwise use the
+ Software alone or in any derivative version, provided, however, that
+ CNRI's License Agreement and CNRI's notice of copyright, i.e.,
+ "Copyright �1996-1999 Corporation for National Research Initiatives;
+ All Rights Reserved" are both retained in the Software, alone or in any
+ derivative version prepared by Licensee.
+
+ Alternatively, in lieu of CNRI's License Agreement, Licensee may
+ substitute the following text (omitting the quotes), provided, however,
+ that such text is displayed prominently in the Software alone or in any
+ derivative version prepared by Licensee: "JPython (Version 1.1.x) is
+ made available subject to the terms and conditions in CNRI's License
+ Agreement. This Agreement may be located on the Internet using the
+ following unique, persistent identifier (known as a handle):
+ 1895.22/1006. The License may also be obtained from a proxy server on
+ the Web using the following URL: http://hdl.handle.net/1895.22/1006."
+
+ 3. In the event Licensee prepares a derivative work that is based on or
+ incorporates the Software or any part thereof, and wants to make the
+ derivative work available to the public as provided herein, then
+ Licensee hereby agrees to indicate in any such work, in a prominently
+ visible way, the nature of the modifications made to CNRI's Software.
+
+ 4. Licensee may not use CNRI trademarks or trade name, including JPython
+ or CNRI, in a trademark sense to endorse or promote products or
+ services of Licensee, or any third party. Licensee may use the mark
+ JPython in connection with Licensee's derivative versions that are
+ based on or incorporate the Software, but only in the form
+ "JPython-based ___________________," or equivalent.
+
+ 5. CNRI is making the Software available to Licensee on an "AS IS" basis.
+ CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
+ OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
+ REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
+ PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
+ ANY THIRD PARTY RIGHTS.
+
+ 6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
+ ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
+ USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
+ THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
+ ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
+ MAY NOT APPLY TO LICENSEE.
+
+ 7. This License Agreement may be terminated by CNRI (i) immediately upon
+ written notice from CNRI of any material breach by the Licensee, if the
+ nature of the breach is such that it cannot be promptly remedied; or
+ (ii) sixty (60) days following notice from CNRI to Licensee of a
+ material remediable breach, if Licensee has not remedied such breach
+ within that sixty-day period.
+
+ 8. This License Agreement shall be governed by and interpreted in all
+ respects by the law of the State of Virginia, excluding conflict of law
+ provisions. Nothing in this Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between CNRI and
+ Licensee.
+
+ 9. By clicking on the "ACCEPT" button where indicated, or by installing,
+ copying or otherwise using the Software, Licensee agrees to be bound by
+ the terms and conditions of this License Agreement.
+
+ [ACCEPT BUTTON]
+
+ B. HISTORY OF THE SOFTWARE
+ =======================================================
+
+ JPython was created in late 1997 by Jim Hugunin. Jim was also the
+ primary developer while he was at CNRI. In February 1999 Barry Warsaw
+ took over as primary developer and released JPython version 1.1.
+
+ In October 2000 Barry helped move the software to SourceForge
+ where it was renamed to Jython. Jython 2.0 and 2.1 were developed
+ under the Jython specific license below.
+
+ From the 2.2 release on, Jython contributors have signed
+ Python Software Foundation contributor agreements and releases are
+ covered under the Python Software Foundation license version 2.
+
+ The standard library is covered by the Python Software Foundation
+ license as well. See the Lib/LICENSE file for details.
+
+ The zxJDBC package was written by Brian Zimmer and originally licensed
+ under the GNU Public License. The package is now covered by the Jython
+ Software License.
+
+ The command line interpreter is covered by the Apache Software
+ License. See the org/apache/LICENSE file for details.
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion DCS bundles Glassfish Jasper 2.1
+and Servlet Specification 2.5 API software which is available under the
+CDDL License.
+https://glassfish.dev.java.net
+https://glassfish.dev.java.net/public/CDDLv1.0.html
+
+ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1.
+
+ Definitions.
+
+ 1.1. Contributor means each individual or entity that creates or contributes
+ to the creation of Modifications.
+
+ 1.2. Contributor Version means the combination of the Original Software,
+ prior Modifications used by a Contributor (if any), and the Modifications made
+ by that particular Contributor.
+
+ 1.3. Covered Software means (a) the Original Software, or (b) Modifications,
+
<TRUNCATED>
[35/39] incubator-trafodion git commit: Making check more clear
Posted by db...@apache.org.
Making check more clear
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/48c419a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/48c419a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/48c419a1
Branch: refs/heads/master
Commit: 48c419a112258bb1ca5d16f781f66d0b17657e22
Parents: 8951412
Author: Amanda Moran <am...@apache.com>
Authored: Tue May 17 16:55:00 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Tue May 17 16:55:00 2016 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48c419a1/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 0f0d346..14d5511 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -701,7 +701,7 @@ function checkClouderaVersion {
if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
#Check that Cloudera 5.2 or 5.3 are not installed.
- if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]]; then
+ if [[ "$CDH_5_4_SUPPORT" == "Y" ]]; then
nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
#Check that Cloudera 5.[n>4].* is not installed.
if [[ -z $nameOfVersion ]]; then
[26/39] incubator-trafodion git commit: Merge [TRAFODION-1982]
Package server components into single tar
Posted by db...@apache.org.
Merge [TRAFODION-1982] Package server components into single tar
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8feea908
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8feea908
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8feea908
Branch: refs/heads/master
Commit: 8feea90876355a7d8cdcd85bc59f90c20dd3fc7e
Parents: 8ee3ac0 e3f4cc2
Author: Steve Varnau <st...@esgyn.com>
Authored: Wed May 11 22:41:18 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Wed May 11 22:41:18 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 34 +-
core/rest/src/assembly/all.xml | 10 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
install/installer/dcs_installer | 17 +-
install/installer/rest_installer | 18 +-
install/installer/traf_apache_mods | 2 +-
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +-
install/installer/traf_config_check | 38 +-
install/installer/traf_config_setup | 69 +-
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 --------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 -----------------
licenses/lic-server-bin | 1834 +++++++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
32 files changed, 2105 insertions(+), 2543 deletions(-)
----------------------------------------------------------------------
[19/39] incubator-trafodion git commit: Merge library management fix
from master to R2.0
Posted by db...@apache.org.
Merge library management fix from master to R2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f716c3f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f716c3f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f716c3f6
Branch: refs/heads/master
Commit: f716c3f6bc6e04aa9af233e1d6c27dcc0ba65caf
Parents: 7b5e5ea
Author: Venkat Muthuswamy <ve...@esgyn.com>
Authored: Tue May 10 14:29:36 2016 -0700
Committer: Venkat Muthuswamy <ve...@esgyn.com>
Committed: Tue May 10 14:29:36 2016 -0700
----------------------------------------------------------------------
core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f716c3f6/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
----------------------------------------------------------------------
diff --git a/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java b/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
index 5e1e2b2..ed96097 100644
--- a/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
+++ b/core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java
@@ -249,6 +249,7 @@ public class FileMgmt {
if (pdsh == null) {
pdsh = "/usr/bin/pdsh";
}
+ execShell(pdsh + " " + nodes + " mkdir -p " + userPath);
execShell(pdcp + " " + nodes + " " + userPath + fileName.trim() + " " + userPath + " ");
execShell(pdsh + " " + nodes + " chmod 755 " + userPath + fileName.trim());
}
[29/39] incubator-trafodion git commit: Printing path
Posted by db...@apache.org.
Printing path
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1e1dca8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1e1dca8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1e1dca8c
Branch: refs/heads/master
Commit: 1e1dca8c0a5ac2413cfaa07fb6cdd5bce8a7c0c3
Parents: 95c553a
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 19:15:53 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 19:15:53 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 1 +
install/installer/rest_installer | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e1dca8c/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index fa07753..7da8567 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -133,6 +133,7 @@ cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
DCS_DIR=$SQ_ROOT/$DCS_DIR
+ echo "***INFO: DCS Install Directory: $DCS_DIR"
else
# untar DCS build into install directory
echo "***INFO: untarring build file $DCS_BUILD_FILE"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e1dca8c/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index a9af0a0..ece48a0 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -96,6 +96,8 @@ cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
REST_DIR=$($SQ_ROOT/$REST_DIR)
+ echo "***INFO: Rest Install Directory: $REST_DIR"
+
else
# untar REST build into install directory
echo "***INFO: untarring build file $REST_BUILD_FILE"
[30/39] incubator-trafodion git commit: [TRAFODION-1992] Re-packaging
server tar file broke install_traf_components
Posted by db...@apache.org.
[TRAFODION-1992] Re-packaging server tar file broke install_traf_components
Change install_traf_components to use built target directory
instead of tar file, now that tar file is not produced for DCS and REST.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/55093a15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/55093a15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/55093a15
Branch: refs/heads/master
Commit: 55093a157338ecef73e038267cb1b9e9d8f4b4f8
Parents: 8feea90
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri May 13 20:34:10 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri May 13 20:34:10 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_traf_components | 50 +++++++++++------------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/55093a15/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index a84f026..9a19f2d 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -39,12 +39,12 @@ REST_SRC=$MY_SQROOT/../rest
PHX_SRC=$MY_SQROOT/../../tests/phx
TRAF_TARS=$MY_SQROOT/../../distribution
-if [ -z "$DCS_TAR" ]; then
- DCS_TAR=$(ls $TRAF_TARS/dcs*tar.gz 2>/dev/null)
+if [ -z "$DCS_BLD" ]; then
+ DCS_BLD=$(ls -d $DCS_SRC/target/dcs-*/dcs-* 2>/dev/null)
fi
-if [ -z "$REST_TAR" ]; then
- REST_TAR=$(ls $TRAF_TARS/rest*tar.gz 2>/dev/null)
+if [ -z "$REST_BLD" ]; then
+ REST_BLD=$(ls -d $REST_SRC/target/rest-*/rest-* 2>/dev/null)
fi
if [ -z "$PHX_TAR" ]; then
@@ -56,7 +56,7 @@ if [ -z "$DCSTEST_TAR" ]; then
fi
if [ -z "$CLIENT_TAR" ]; then
- CLIENT_TAR=$(ls $TRAF_TARS/*clients*.tgz 2>/dev/null)
+ CLIENT_TAR=$(ls $TRAF_TARS/*clients* 2>/dev/null)
fi
if [[ -f $CLIENT_TAR ]]; then
@@ -84,8 +84,8 @@ else
fi
echo " For local hadoop... $MY_SW_ROOT" | tee -a ${MY_LOG_FILE}
-echo " For DCS_TAR... $DCS_TAR" | tee -a ${MY_LOG_FILE}
-echo " For REST_TAR... $REST_TAR" | tee -a ${MY_LOG_FILE}
+echo " For DCS_BLD... $DCS_BLD" | tee -a ${MY_LOG_FILE}
+echo " For REST_BLD... $REST_BLD" | tee -a ${MY_LOG_FILE}
if [[ -f $PHX_TAR ]]; then
echo " For PHX_TAR... $PHX_TAR" | tee -a ${MY_LOG_FILE}
@@ -105,31 +105,31 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d dcs-* ]; then
echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
else
- if [[ -f $DCS_TAR ]]; then
- echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $DCS_BLD ]]; then
+ echo "Using DCS Build: $DCS_BLD" | tee -a ${MY_LOG_FILE}
elif [[ -d $DCS_SRC ]]; then
- echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
- echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
+ echo "DCS built target was not found in $DCS_SRC" | tee -a ${MY_LOG_FILE}
+ echo "Building DCS" | tee -a ${MY_LOG_FILE}
if [[ -f $MY_SQROOT/export/lib/jdbcT4.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build DCS from $DCS_SRC" | tee -a ${MY_LOG_FILE}
cd $DCS_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
- mv $DCS_SRC/target/dcs*.gz $TRAF_TARS
cd $MY_SW_ROOT
else
echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. " | tee -a ${MY_LOG_FILE}
echo "Please build the core Trafodion component" | tee -a ${MY_LOG_FILE}
exit 2
fi
+ DCS_BLD=$(ls -d $DCS_SRC/target/dcs-*/dcs-* 2>/dev/null)
fi
- if [[ ! -f $DCS_TAR ]]; then
- echo "**** ERROR: DCS tar file not found. " | tee -a ${MY_LOG_FILE}
+ if [[ ! -d $DCS_BLD ]]; then
+ echo "**** ERROR: DCS built target not found. " | tee -a ${MY_LOG_FILE}
exit 2
fi
# Install DCS
- echo "Installing DCS from: $DCS_TAR" | tee -a ${MY_LOG_FILE}
- tar xzf $DCS_TAR | tee -a ${MY_LOG_FILE}
+ echo "Installing DCS from: $DCS_BLD" | tee -a ${MY_LOG_FILE}
+ cp -r $DCS_BLD $MY_SW_ROOT/$(basename $DCS_BLD)
DCS_HOME=$(/bin/ls -d $MY_SW_ROOT/dcs-*)
# Configure DCS
@@ -188,31 +188,31 @@ echo | tee -a ${MY_LOG_FILE}
if [ -d rest-* ]; then
echo "REST files already exist, skipping REST setup"
else
- if [[ -f $REST_TAR ]]; then
- echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $REST_BLD ]]; then
+ echo "Using REST Build: $REST_BLD" | tee -a ${MY_LOG_FILE}
elif [[ -d $REST_SRC ]]; then
- echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
- echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
+ echo "REST built target was not found in $REST_SRC" | tee -a ${MY_LOG_FILE}
+ echo "Building REST" | tee -a ${MY_LOG_FILE}
if [[ -f $MY_SQROOT/export/lib/jdbcT4.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build REST from $REST_SRC" | tee -a ${MY_LOG_FILE}
cd $REST_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
- mv $REST_SRC/target/rest*.gz $TRAF_TARS
cd $MY_SW_ROOT
else
echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. Please build the core Trafodion components" | tee -a ${MY_LOG_FILE}
exit 2
fi
+ REST_BLD=$(ls -d $REST_SRC/target/rest-*/rest-* 2>/dev/null)
fi
- if [[ ! -f $REST_TAR ]]; then
- echo "**** ERROR: REST tar file not found" | tee -a ${MY_LOG_FILE}
+ if [[ ! -d $REST_BLD ]]; then
+ echo "**** ERROR: REST build target not found" | tee -a ${MY_LOG_FILE}
exit 2
fi
# Install REST
- echo "Installing REST from: $REST_TAR" | tee -a ${MY_LOG_FILE}
- tar xzf $REST_TAR | tee -a ${MY_LOG_FILE}
+ echo "Installing REST from: $REST_BLD" | tee -a ${MY_LOG_FILE}
+ cp -r $REST_BLD $MY_SW_ROOT/$(basename $REST_BLD)
REST_HOME=$(/bin/ls -d $MY_SW_ROOT/rest-*)
# Configure REST
[11/39] incubator-trafodion git commit: Merge [TRAFODION-1972] PR 466
Remove docs directories from exclude list
Posted by db...@apache.org.
Merge [TRAFODION-1972] PR 466 Remove docs directories from exclude list
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/84620dff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/84620dff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/84620dff
Branch: refs/heads/master
Commit: 84620dffb7dbf5e6df95c0dbb8914e80574572ce
Parents: af67497 d9890d6
Author: Dave Birdsall <db...@apache.org>
Authored: Thu May 5 15:29:53 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu May 5 15:29:53 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
[09/39] incubator-trafodion git commit: [TRAFODION-1972] Remove docs
directories from exclude list
Posted by db...@apache.org.
[TRAFODION-1972] Remove docs directories from exclude list
This will allow these directories to be included in source package,
and hence in the official released code.
Note that it also includes the website pages, which provides a snapshot
in time of the project site, for whatever that is worth.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d9890d6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d9890d6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d9890d6e
Branch: refs/heads/master
Commit: d9890d6eda94d6e2f061e3e0794f28fbea4063b4
Parents: af67497
Author: Steve Varnau <st...@esgyn.com>
Authored: Wed May 4 23:22:50 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Wed May 4 23:28:05 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d9890d6e/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 4342c5c..085794d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,3 @@
# git files
.gitignore export-ignore
.gitattributes export-ignore
-# Remove documentation until until our generation code is available
-docs/client_install export-ignore
-docs/command_interface export-ignore
-docs/odb_manual export-ignore
-docs/sql_reference export-ignore
-docs/src/site export-ignore
[15/39] incubator-trafodion git commit: [TRAFODION-1982] Combine
server components into single tar file
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
index 6e34cbd..163d5a1 100644
--- a/licenses/lic-server-src
+++ b/licenses/lic-server-src
@@ -74,3 +74,72 @@ MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
+++++++++++++++++++++++++++++
+===============================================================================
+The DCS subcomponent of Apache Trafodion bundles source with BSD-like and
+MIT-like licenses:
+
++++++++++++++++++++++++++++++
+
+BSD-3 clause for files in:
+ incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
+
+ Copyright 2009 Allan Jardine. All Rights Reserved
+ Copyright 2008-2012 Allan Jardine, all rights reserved.
+
+For details see:
+ incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
+
++++++++++++++++++++++++++++++
+
+MIT-Expat for files in:
+ incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
+
+ Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/)
+ Copyright (c) 2006-2010 Valerio Proietti
+
+ 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.
+
++++++++++++++++++++++++++++++
+
+MIT-Expat for files in:
+ incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
+ incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
+
+ Copyright 2014 jQuery Foundation and other contributors
+ (c) 2005, 2014 jQuery Foundation, Inc.
+
+ 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/incubator-trafodion/blob/c8ef9645/licenses/not-dcs-bin
----------------------------------------------------------------------
diff --git a/licenses/not-dcs-bin b/licenses/not-dcs-bin
deleted file mode 100644
index f5293e3..0000000
--- a/licenses/not-dcs-bin
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Notices for Jython bundled software:
-
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xerces Java distribution. ==
- =========================================================================
-
- Apache Xerces Java
- Copyright 1999-2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/not-rest-bin
----------------------------------------------------------------------
diff --git a/licenses/not-rest-bin b/licenses/not-rest-bin
deleted file mode 100644
index f5293e3..0000000
--- a/licenses/not-rest-bin
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Notices for Jython bundled software:
-
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xerces Java distribution. ==
- =========================================================================
-
- Apache Xerces Java
- Copyright 1999-2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/note-server-bin
----------------------------------------------------------------------
diff --git a/licenses/note-server-bin b/licenses/note-server-bin
new file mode 100644
index 0000000..f5293e3
--- /dev/null
+++ b/licenses/note-server-bin
@@ -0,0 +1,20 @@
+
+Notices for Jython bundled software:
+
+ =========================================================================
+ == NOTICE file corresponding to section 4(d) of the Apache License, ==
+ == Version 2.0, in this case for the Apache Xerces Java distribution. ==
+ =========================================================================
+
+ Apache Xerces Java
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
[25/39] incubator-trafodion git commit: Merge PR 475 library
management fix into Trafodion Release 2.0
Posted by db...@apache.org.
Merge PR 475 library management fix into Trafodion Release 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8ee3ac09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8ee3ac09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8ee3ac09
Branch: refs/heads/master
Commit: 8ee3ac0937e04b0641137ef1b09104340b99291b
Parents: 7b5e5ea f716c3f
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 11 15:58:07 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 11 15:58:07 2016 +0000
----------------------------------------------------------------------
core/sql/lib_mgmt/src/main/java/org/trafodion/libmgmt/FileMgmt.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[12/39] incubator-trafodion git commit: Merge [TRAFODION-1973] PR 467
Fix unpacking of hadoop dependencies
Posted by db...@apache.org.
Merge [TRAFODION-1973] PR 467 Fix unpacking of hadoop dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b3f7856f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b3f7856f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b3f7856f
Branch: refs/heads/master
Commit: b3f7856f5e63690f51ded33f11bd87103c8d4e51
Parents: 84620df dee9586
Author: Dave Birdsall <db...@apache.org>
Authored: Thu May 5 15:34:43 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu May 5 15:34:43 2016 +0000
----------------------------------------------------------------------
install/traf_tools_setup.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[33/39] incubator-trafodion git commit: removing sudo
Posted by db...@apache.org.
removing sudo
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c0552b02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c0552b02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c0552b02
Branch: refs/heads/master
Commit: c0552b02c30e4da6aa419fbc76e763a3d62b0a3e
Parents: 0205fce
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 21:55:52 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 21:55:52 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 2 +-
install/installer/rest_installer | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c0552b02/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 7da8567..8c9d544 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,7 +131,7 @@ mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
+ DCS_DIR=$(ls $SQ_ROOT | grep dcs)
DCS_DIR=$SQ_ROOT/$DCS_DIR
echo "***INFO: DCS Install Directory: $DCS_DIR"
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c0552b02/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index ae89807..7e52448 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,7 +94,7 @@ mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
+ REST_DIR=$(ls $SQ_ROOT | grep rest)
REST_DIR=$SQ_ROOT/$REST_DIR
echo "***INFO: Rest Install Directory: $REST_DIR"
[02/39] incubator-trafodion git commit: Merge [TRAFODION-1916] PR 449
dcscheck CDH5.4.4 HBase 1.0.0 fix
Posted by db...@apache.org.
Merge [TRAFODION-1916] PR 449 dcscheck CDH5.4.4 HBase 1.0.0 fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5dc67545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5dc67545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5dc67545
Branch: refs/heads/master
Commit: 5dc67545748a9f43d3982e0a975ac1ed51b7ffb4
Parents: 78cb6b8 59910b8
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Apr 27 15:20:19 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Apr 27 15:20:19 2016 +0000
----------------------------------------------------------------------
dcs/src/assembly/all.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[14/39] incubator-trafodion git commit: Merge [TRAFODION-1951] Fix
for JAVA checking
Posted by db...@apache.org.
Merge [TRAFODION-1951] Fix for JAVA checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7b5e5ea0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7b5e5ea0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7b5e5ea0
Branch: refs/heads/master
Commit: 7b5e5ea010789a063e40dcb8d7fdcc8d3f6fc704
Parents: b3f7856 e208598
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu May 5 23:20:05 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu May 5 23:20:05 2016 +0000
----------------------------------------------------------------------
.../installer/traf_apache_hadoop_config_setup | 842 -------------------
install/installer/traf_config_check | 8 +-
.../installer/trafodion_apache_hadoop_install | 763 -----------------
3 files changed, 7 insertions(+), 1606 deletions(-)
----------------------------------------------------------------------
[28/39] incubator-trafodion git commit: TRAFODION-1993 Expand DCS and
REST directories
Posted by db...@apache.org.
TRAFODION-1993 Expand DCS and REST directories
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/95c553a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/95c553a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/95c553a9
Branch: refs/heads/master
Commit: 95c553a91772f4a8908655887ede11c539c6ed7c
Parents: 19b8d1f
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 19:14:03 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 19:14:03 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 3 ++-
install/installer/rest_installer | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/95c553a9/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index cf5e744..fa07753 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,7 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- DCS_DIR="$SQ_ROOT/dcs*"
+ DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
+ DCS_DIR=$SQ_ROOT/$DCS_DIR
else
# untar DCS build into install directory
echo "***INFO: untarring build file $DCS_BUILD_FILE"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/95c553a9/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index e3cde2e..a9af0a0 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,7 +94,8 @@ mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
- REST_DIR="$SQ_ROOT/rest*"
+ REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
+ REST_DIR=$($SQ_ROOT/$REST_DIR)
else
# untar REST build into install directory
echo "***INFO: untarring build file $REST_BUILD_FILE"
[22/39] incubator-trafodion git commit: [TRAFODION-1982] Tell RAT
exclusions about file rename
Posted by db...@apache.org.
[TRAFODION-1982] Tell RAT exclusions about file rename
That's what I get for renaming file for clarity from "not-" to "note-"
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e3f4cc26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e3f4cc26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e3f4cc26
Branch: refs/heads/master
Commit: e3f4cc2667c14b7bc141587d262b1e59f2da3ced
Parents: c861ea9
Author: Steve Varnau <st...@esgyn.com>
Authored: Tue May 10 23:28:58 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Tue May 10 23:28:58 2016 +0000
----------------------------------------------------------------------
.rat-excludes | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e3f4cc26/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index a7c54db..d36814f 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -59,7 +59,7 @@ license*.txt*
LICENSE.rtf*
lic-.*-src
lic-.*-bin
-not-.*-bin
+note-.*-bin
# win generated
SetCertificateDirReg_os.vcxproj*
SetCertificateDirReg_os.vcxproj.*
[05/39] incubator-trafodion git commit: Merge remote branch
'origin/pr/456/head' into merge456
Posted by db...@apache.org.
Merge remote branch 'origin/pr/456/head' into merge456
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ccafdcfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ccafdcfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ccafdcfc
Branch: refs/heads/master
Commit: ccafdcfca6d54af14971f935eed6efb8f9e36e36
Parents: 5dc6754 6e674c6
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Apr 29 05:38:08 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Apr 29 05:38:08 2016 +0000
----------------------------------------------------------------------
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[34/39] incubator-trafodion git commit: [[TRAFODION -1997]] Prevent
Cloudera install on 5.5/6
Posted by db...@apache.org.
[[TRAFODION -1997]] Prevent Cloudera install on 5.5/6
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/89514127
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/89514127
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/89514127
Branch: refs/heads/master
Commit: 895141273cd7ef8b029f68891a10fb00553327a3
Parents: c0552b0
Author: Amanda Moran <am...@apache.com>
Authored: Mon May 16 22:15:34 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Mon May 16 22:15:34 2016 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/89514127/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 49637c3..0f0d346 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -702,7 +702,7 @@ function checkClouderaVersion {
if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
#Check that Cloudera 5.2 or 5.3 are not installed.
if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]]; then
- nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.[4-6].*)
+ nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
#Check that Cloudera 5.[n>4].* is not installed.
if [[ -z $nameOfVersion ]]; then
versionInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh[5-9].[7-9].* | wc -l)
[17/39] incubator-trafodion git commit: [TRAFODION-1982] Combine
server components into single tar file
Posted by db...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/lic-rest-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-rest-bin b/licenses/lic-rest-bin
deleted file mode 100644
index de44ba8..0000000
--- a/licenses/lic-rest-bin
+++ /dev/null
@@ -1,1416 +0,0 @@
-===============================================================================
-The binary distribution of Apache Trafodion REST Server bundles Jetty software
-which is available under the Apache License Version 2.0 (ALv2), though developed
-outside of the ASF. The bundled software includes Jetty Server, Jetty Utilities,
-Jetty Servlet Container, Jetty Http Utility, and Jetty IO Utility.
-http://www.eclipse.org/jetty/
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion REST Server bundles Jettison software
-which is available under the Apache License Version 2.0 (ALv2), though developed
-outside of the ASF. https://github.com/codehaus/jettison
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion REST Server bundles SLF4J (Simple
-Logging Facade for Java) software which is available under the MIT/X11 License.
-http://www.slf4j.org
-
- Copyright (c) 2004-2013 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.
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion DCS bundles Jython Standalone
-software which is available under the Python Software License.
-http://www.jython.org
-
- ====================================
- The Jython License
- ====================================
-
-
- A. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
- ==============================================================================================================
-
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- ----------------------------------------------------------------------------------------
-
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Jython") in source or binary form and
- its associated documentation.
-
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Jython alone
- or in any derivative version, provided, however, that PSF's License
- Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2007
- Python Software Foundation; All Rights Reserved" are retained in
- Jython alone or in any derivative version prepared by Licensee.
-
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Jython or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Jython.
-
- 4. PSF is making Jython available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF JYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
-
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
-
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
-
- 8. By copying, installing or otherwise using Jython, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
-
- Jython 2.0, 2.1 License
- --------------------------------------------
-
- Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
- 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 Jython Developers 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 REGENTS 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.
-
-
-
- JPython 1.1.x Software License.
- ______________________________________________________________________
-
- 1. This LICENSE AGREEMENT is between the Corporation for National Research
- Initiatives, having an office at 1895 Preston White Drive, Reston, VA
- 20191 ("CNRI"), and the Individual or Organization ("Licensee")
- accessing and using JPython version 1.1.x in source or binary form and
- its associated documentation as provided herein ("Software").
-
- 2. Subject to the terms and conditions of this License Agreement, CNRI
- hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
- world-wide license to reproduce, analyze, test, perform and/or display
- publicly, prepare derivative works, distribute, and otherwise use the
- Software alone or in any derivative version, provided, however, that
- CNRI's License Agreement and CNRI's notice of copyright, i.e.,
- "Copyright �1996-1999 Corporation for National Research Initiatives;
- All Rights Reserved" are both retained in the Software, alone or in any
- derivative version prepared by Licensee.
-
- Alternatively, in lieu of CNRI's License Agreement, Licensee may
- substitute the following text (omitting the quotes), provided, however,
- that such text is displayed prominently in the Software alone or in any
- derivative version prepared by Licensee: "JPython (Version 1.1.x) is
- made available subject to the terms and conditions in CNRI's License
- Agreement. This Agreement may be located on the Internet using the
- following unique, persistent identifier (known as a handle):
- 1895.22/1006. The License may also be obtained from a proxy server on
- the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
- 3. In the event Licensee prepares a derivative work that is based on or
- incorporates the Software or any part thereof, and wants to make the
- derivative work available to the public as provided herein, then
- Licensee hereby agrees to indicate in any such work, in a prominently
- visible way, the nature of the modifications made to CNRI's Software.
-
- 4. Licensee may not use CNRI trademarks or trade name, including JPython
- or CNRI, in a trademark sense to endorse or promote products or
- services of Licensee, or any third party. Licensee may use the mark
- JPython in connection with Licensee's derivative versions that are
- based on or incorporate the Software, but only in the form
- "JPython-based ___________________," or equivalent.
-
- 5. CNRI is making the Software available to Licensee on an "AS IS" basis.
- CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
- OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
- REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
- PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
- ANY THIRD PARTY RIGHTS.
-
- 6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
- ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
- USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
- THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
- ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
- MAY NOT APPLY TO LICENSEE.
-
- 7. This License Agreement may be terminated by CNRI (i) immediately upon
- written notice from CNRI of any material breach by the Licensee, if the
- nature of the breach is such that it cannot be promptly remedied; or
- (ii) sixty (60) days following notice from CNRI to Licensee of a
- material remediable breach, if Licensee has not remedied such breach
- within that sixty-day period.
-
- 8. This License Agreement shall be governed by and interpreted in all
- respects by the law of the State of Virginia, excluding conflict of law
- provisions. Nothing in this Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between CNRI and
- Licensee.
-
- 9. By clicking on the "ACCEPT" button where indicated, or by installing,
- copying or otherwise using the Software, Licensee agrees to be bound by
- the terms and conditions of this License Agreement.
-
- [ACCEPT BUTTON]
-
- B. HISTORY OF THE SOFTWARE
- =======================================================
-
- JPython was created in late 1997 by Jim Hugunin. Jim was also the
- primary developer while he was at CNRI. In February 1999 Barry Warsaw
- took over as primary developer and released JPython version 1.1.
-
- In October 2000 Barry helped move the software to SourceForge
- where it was renamed to Jython. Jython 2.0 and 2.1 were developed
- under the Jython specific license below.
-
- From the 2.2 release on, Jython contributors have signed
- Python Software Foundation contributor agreements and releases are
- covered under the Python Software Foundation license version 2.
-
- The standard library is covered by the Python Software Foundation
- license as well. See the Lib/LICENSE file for details.
-
- The zxJDBC package was written by Brian Zimmer and originally licensed
- under the GNU Public License. The package is now covered by the Jython
- Software License.
-
- The command line interpreter is covered by the Apache Software
- License. See the org/apache/LICENSE file for details.
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion REST Server bundles Jersey Server,
-and Jersey JSON software which are available under dual CDDL1.1 and GPL2 License.
-https://jersey.java.net
-http://glassfish.java.net/public/CDDL+GPL_1_1.html
-
- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
-
- 1. Definitions.
-
- 1.1. \u201cContributor\u201d means each individual or entity that creates or contributes
- to the creation of Modifications.
- 1.2. \u201cContributor Version\u201d means the combination of the Original Software,
- prior Modifications used by a Contributor (if any), and the Modifications
- made by that particular Contributor.
- 1.3. \u201cCovered Software\u201d means (a) the Original Software, or (b) Modifications,
- or (c) the combination of files containing Original Software with files containing
- Modifications, in each case including portions thereof.
- 1.4. \u201cExecutable\u201d means the Covered Software in any form other than Source Code.
- 1.5. \u201cInitial Developer\u201d means the individual or entity that first makes Original
- Software available under this License.
- 1.6. \u201cLarger Work\u201d means a work which combines Covered Software or portions
- thereof with code not governed by the terms of this License.
- 1.7. \u201cLicense\u201d means this document.
- 1.8. \u201cLicensable\u201d means having the right to grant, to the maximum extent possible,
- whether at the time of the initial grant or subsequently acquired, any and all of
- the rights conveyed herein.
- 1.9. \u201cModifications\u201d means the Source Code and Executable form of any of the
- following:
- A. Any file that results from an addition to, deletion from or modification of
- the contents of a file containing Original Software or previous Modifications;
- B. Any new file that contains any part of the Original Software or previous
- Modification; or
- C. Any new file that is contributed or otherwise made available under the terms
- of this License.
- 1.10. \u201cOriginal Software\u201d means the Source Code and Executable form of computer
- software code that is originally released under this License.
- 1.11. \u201cPatent Claims\u201d means any patent claim(s), now owned or hereafter acquired,
- including without limitation, method, process, and apparatus claims, in any patent
- Licensable by grantor.
- 1.12. \u201cSource Code\u201d means (a) the common form of computer software code in which
- modifications are made and (b) associated documentation included in or with such code.
- 1.13. \u201cYou\u201d (or \u201cYour\u201d) means an individual or a legal entity exercising rights under,
- and complying with all of the terms of, this License. For legal entities, \u201cYou\u201d
- includes any entity which controls, is controlled by, or is under common control
- with You. For purposes of this definition, \u201ccontrol\u201d means (a) the power, direct
- or indirect, to cause the direction or management of such entity, whether by
- contract or otherwise, or (b) ownership of more than fifty percent (50%) of the
- outstanding shares or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
- Conditioned upon Your compliance with Section 3.1 below and subject to third
- party intellectual property claims, the Initial Developer hereby grants You a
- world-wide, royalty-free, non-exclusive license:
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Initial Developer, to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or portions thereof), with or
- without Modifications, and/or as part of a Larger Work; and
- (b) under Patent Claims infringed by the making, using or selling of Original
- Software, to make, have made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or portions thereof).
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
- Initial Developer first distributes or otherwise makes the Original Software
- available to a third party under the terms of this License.
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted:
- (1) for code that You delete from the Original Software, or (2) for
- infringements caused by: (i) the modification of the Original Software, or
- (ii) the combination of the Original Software with other software or devices.
-
- 2.2. Contributor Grant.
- Conditioned upon Your compliance with Section 3.1 below and subject to third
- party intellectual property claims, each Contributor hereby grants You a
- world-wide, royalty-free, non-exclusive license:
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Contributor to use, reproduce, modify, display, perform,
- sublicense and distribute the Modifications created by such Contributor (or
- portions thereof), either on an unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in combination with
- its Contributor Version (or portions of such combination), to make, use, sell,
- offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
- by that Contributor (or portions thereof); and (2) the combination of
- Modifications made by that Contributor with its Contributor Version (or
- portions of such combination).
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date
- Contributor first distributes or otherwise makes the Modifications available to
- a third party.
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted:
- (1) for any code that Contributor has deleted from the Contributor
- Version; (2) for infringements caused by: (i) third party modifications of
- Contributor Version, or (ii) the combination of Modifications made by that
- Contributor with other software (except as part of the Contributor Version) or
- other devices; or (3) under Patent Claims infringed by Covered Software in the
- absence of Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
- Any Covered Software that You distribute or otherwise make available in
- Executable form must also be made available in Source Code form and that Source
- Code form must be distributed only under the terms of this License. You must
- include a copy of this License with every copy of the Source Code form of the
- Covered Software You distribute or otherwise make available. You must inform
- recipients of any such Covered Software in Executable form as to how they can
- obtain such Covered Software in Source Code form in a reasonable manner on or
- through a medium customarily used for software exchange.
-
- 3.2. Modifications.
- The Modifications that You create or to which You contribute are governed by the
- terms of this License. You represent that You believe Your Modifications are
- Your original creation(s) and/or You have sufficient rights to grant the rights
- conveyed by this License.
-
- 3.3. Required Notices.
- You must include a notice in each of Your Modifications that identifies You as
- the Contributor of the Modification. You may not remove or alter any copyright,
- patent or trademark notices contained within the Covered Software, or any
- notices of licensing or any descriptive text giving attribution to any
- Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
- You may not offer or impose any terms on any Covered Software in Source
- Code form that alters or restricts the applicable version of this License or the
- recipients' rights hereunder. You may choose to offer, and to charge a fee for,
- warranty, support, indemnity or liability obligations to one or more recipients
- of Covered Software. However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You must make it absolutely
- clear that any such warranty, support, indemnity or liability obligation is
- offered by You alone, and You hereby agree to indemnify the Initial Developer
- and every Contributor for any liability incurred by the Initial Developer or
- such Contributor as a result of warranty, support, indemnity or liability terms
- You offer.
-
- 3.5. Distribution of Executable Versions.
- You may distribute the Executable form of the Covered Software under the terms
- of this License or under the terms of a license of Your choice, which may
- contain terms different from this License, provided that You are in compliance
- with the terms of this License and that the license for the Executable form
- does not attempt to limit or alter the recipient's rights in the Source Code
- form from the rights set forth in this License. If You distribute the Covered
- Software in Executable form under a different license, You must make it
- absolutely clear that any terms which differ from this License are offered by
- You alone, not by the Initial Developer or Contributor. You hereby agree to
- indemnify the Initial Developer and every Contributor for any liability incurred
- by the Initial Developer or such Contributor as a result of any such terms You offer.
-
- 3.6. Larger Works.
- You may create a Larger Work by combining Covered Software with other code not
- governed by the terms of this License and distribute the Larger Work as a single
- product. In such a case, You must make sure the requirements of this License are
- fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions.
- Oracle is the initial license steward and may publish revised and/or new versions
- of this License from time to time. Each version will be given a distinguishing
- version number. Except as provided in Section 4.3, no one other than the license
- steward has the right to modify this License.
-
- 4.2. Effect of New Versions.
- You may always continue to use, distribute or otherwise make the Covered Software
- available under the terms of the version of the License under which You originally
- received the Covered Software. If the Initial Developer includes a notice in the
- Original Software prohibiting it from being distributed or otherwise made available
- under any subsequent version of the License, You must distribute and make the
- Covered Software available under the terms of the version of the License under
- which You originally received the Covered Software. Otherwise, You may also choose
- to use, distribute or otherwise make the Covered Software available under the
- terms of any subsequent version of the License published by the license steward.
-
- 4.3. Modified Versions.
- When You are an Initial Developer and You want to create a new license for Your Original
- Software, You may create and use a modified version of this License if You: (a)
- rename the license and remove any references to the name of the license steward
- (except to note that the license differs from this License); and (b) otherwise
- make it clear that the license contains terms which differ from this License.
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN \u201cAS IS\u201d BASIS, WITHOUT
- WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
- LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
- MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS
- TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
- COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER
- OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
- CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- THIS DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure such
- breach within 30 days of becoming aware of the breach. Provisions which, by
- their nature, must remain in effect beyond the termination of this License shall
- survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory
- judgment actions) against Initial Developer or a Contributor (the Initial
- Developer or Contributor against whom You assert such claim is referred to as
- \u201cParticipant\u201d) alleging that the Participant Software (meaning the Contributor
- Version where the Participant is a Contributor or the Original Software where
- the Participant is the Initial Developer) directly or indirectly infringes any
- patent, then any and all rights granted directly or indirectly to You by such
- Participant, the Initial Developer (if the Initial Developer is not the
- Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License
- shall, upon 60 days notice from Participant terminate prospectively and
- automatically at the expiration of such 60 day notice period, unless if within
- such 60 day period You withdraw Your claim with respect to the Participant
- Software against such Participant either unilaterally or pursuant to a written
- agreement with Participant.
-
- 6.3. If You assert a patent infringement claim against Participant alleging that
- the Participant Software directly or indirectly infringes any patent where such
- claim is resolved (such as by license or settlement) prior to the initiation of
- patent infringement litigation, then the reasonable value of the licenses
- granted by such Participant under Sections 2.1 or 2.2 shall be taken into
- account in determining the amount or value of any payment or license.
-
- 6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user
- licenses that have been validly granted by You or any distributor hereunder
- prior to termination (excluding licenses granted to You by any distributor)
- shall survive termination.
-
- 7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
- NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
- CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF
- SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
- FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
- ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL
- NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S
- NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
- JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
- CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a \u201ccommercial item,\u201d as that term is defined in 48
- C.F.R. 2.101 (Oct. 1995), consisting of \u201ccommercial computer software\u201d (as that
- term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and \u201ccommercial computer
- software documentation\u201d as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
- Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
- (June 1995), all U.S. Government End Users acquire Covered Software with only
- those rights set forth herein. This U.S. Government Rights clause is in lieu of,
- and supersedes, any other FAR, DFAR, or other clause or provision that addresses
- Government rights in computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
- hereof. If any provision of this License is held to be unenforceable, such
- provision shall be reformed only to the extent necessary to make it enforceable.
- This License shall be governed by the law of the jurisdiction specified in a
- notice contained within the Original Software (except to the extent applicable
- law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law
- provisions. Any litigation relating to this License shall be subject to the
- jurisdiction of the courts located in the jurisdiction and venue specified in a
- notice contained within the Original Software, with the losing party responsible
- for costs, including, without limitation, court costs and reasonable attorneys'
- fees and expenses. The application of the United Nations Convention on Contracts
- for the International Sale of Goods is expressly excluded. Any law or regulation
- which provides that the language of a contract shall be construed against the
- drafter shall not apply to this License. You agree that You alone are
- responsible for compliance with the United States export administration
- regulations (and the export control laws and regulation of any other countries)
- when You use, distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is responsible
- for claims and damages arising, directly or indirectly, out of its utilization
- of rights under this License and You agree to work with Initial Developer and
- Contributors to distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
- The code released under the CDDL shall be governed by the laws of the State of
- California (excluding conflict-of-law provisions). Any litigation relating to
- this License shall be subject to the jurisdiction of the Federal Courts of the
- Northern District of California and the state courts of the State of California,
- with venue lying in Santa Clara County, California.
-
-
-
- The GNU General Public License (GPL) Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place,
- Suite 330, Boston, MA 02111-1307 USA
-
- Everyone is permitted to copy and distribute verbatim copies of this license
- document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your freedom to share
- and change it. By contrast, the GNU General Public License is intended to
- guarantee your freedom to share and change free software--to make sure the
- software is free for all its users. This General Public License applies to most
- of the Free Software Foundation's software and to any other program whose
- authors commit to using it. (Some other Free Software Foundation software is
- covered by the GNU Library General Public License instead.) You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not price. Our
- General Public Licenses are designed to make sure that you have the freedom to
- distribute copies of free software (and charge for this service if you wish),
- that you receive source code or can get it if you want it, that you can change
- the software or use pieces of it in new free programs; and that you know you can
- do these things.
-
- To protect your rights, we need to make restrictions that forbid anyone to
- deny you these rights or to ask you to surrender the rights. These restrictions
- translate to certain responsibilities for you if you distribute copies of the
- software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether gratis or for
- a fee, you must give the recipients all the rights that you have. You must make
- sure that they, too, receive or can get the source code. And you must show them
- these terms so they know their rights.
-
- We protect your rights with two steps: (1) copyright the software, and (2)
- offer you this license which gives you legal permission to copy, distribute
- and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain that
- everyone understands that there is no warranty for this free software. If the
- software is modified by someone else and passed on, we want its recipients to
- know that what they have is not the original, so that any problems introduced by
- others will not reflect on the original authors' reputations.
-
- Finally, any free program is threatened constantly by software patents. We
- wish to avoid the danger that redistributors of a free program will individually
- obtain patent licenses, in effect making the program proprietary. To prevent
- this, we have made it clear that any patent must be licensed for everyone's free
- use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and modification
- follow.
-
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains a notice
- placed by the copyright holder saying it may be distributed under the terms of
- this General Public License. The "Program", below, refers to any such program or
- work, and a "work based on the Program" means either the Program or any
- derivative work under copyright law: that is to say, a work containing the
- Program or a portion of it, either verbatim or with modifications and/or
- translated into another language. (Hereinafter, translation is included without
- limitation in the term "modification".) Each licensee is addressed as "you".
-
- Activities other than copying, distribution and modification are not covered
- by this License; they are outside its scope. The act of running the Program is
- not restricted, and the output from the Program is covered only if its contents
- constitute a work based on the Program (independent of having been made by
- running the Program). Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's source code as
- you receive it, in any medium, provided that you conspicuously and appropriately
- publish on each copy an appropriate copyright notice and disclaimer of warranty;
- keep intact all the notices that refer to this License and to the absence of any
- warranty; and give any other recipients of the Program a copy of this License
- along with the Program.
-
- You may charge a fee for the physical act of transferring a copy, and you may
- at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion of it,
- thus forming a work based on the Program, and copy and distribute such
- modifications or work under the terms of Section 1 above, provided that you also
- meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices stating that
- you changed the files and the date of any change.
- b) You must cause any work that you distribute or publish, that in whole or
- in part contains or is derived from the Program or any part thereof, to be
- licensed as a whole at no charge to all third parties under the terms of this License.
- c) If the modified program normally reads commands interactively when run, you must
- cause it, when started running for such interactive use in the most ordinary
- way, to print or display an announcement including an appropriate copyright
- notice and a notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under these conditions,
- and telling the user how to view a copy of this License. (Exception: if the
- Program itself is interactive but does not normally print such an announcement,
- your work based on the Program is not required to print an announcement.)
-
- These requirements apply to the modified work as a whole. If identifiable sections
- of that work are not derived from the Program, and can be reasonably considered
- independent and separate works in themselves, then this License, and its terms, do
- not apply to those sections when you distribute them as separate works. But when you
- distribute the same sections as part of a whole which is a work based on the
- Program, the distribution of the whole must be on the terms of this License,
- whose permissions for other licensees extend to the entire whole, and thus to
- each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest your
- rights to work written entirely by you; rather, the intent is to exercise the
- right to control the distribution of derivative or collective works based on the
- Program.
-
- In addition, mere aggregation of another work not based on the Program with
- the Program (or with a work based on the Program) on a volume of a storage or
- distribution medium does not bring the other work under the scope of this
- License.
-
- 3. You may copy and distribute the Program (or a work based on it, under
- Section 2) in object code or executable form under the terms of Sections 1 and 2
- above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable source code,
- which must be distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
- b) Accompany it with a written offer, valid for at least three years, to give
- any third party, for a charge no more than your cost of physically performing
- source distribution, a complete machine-readable copy of the corresponding source
- code, to be distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
- c) Accompany it with the information you received as to the offer to distribute
- corresponding source code. (This alternative is allowed only for noncommercial
- distribution and only if you received the program in object code or executable
- form with such an offer, in accord with Subsection b above.)
-
- The source code for a work means the preferred form of the work for making
- modifications to it. For an executable work, complete source code means all the
- source code for all modules it contains, plus any associated interface
- definition files, plus the scripts used to control compilation and installation
- of the executable. However, as a special exception, the source code distributed
- need not include anything that is normally distributed (in either source or
- binary form) with the major components (compiler, kernel, and so on) of the
- operating system on which the executable runs, unless that component itself
- accompanies the executable.
-
- If distribution of executable or object code is made by offering access to
- copy from a designated place, then offering equivalent access to copy the source
- code from the same place counts as distribution of the source code, even though
- third parties are not compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program except as
- expressly provided under this License. Any attempt otherwise to copy, modify,
- sublicense or distribute the Program is void, and will automatically terminate
- your rights under this License. However, parties who have received copies, or
- rights, from you under this License will not have their licenses terminated so
- long as such parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not signed it.
- However, nothing else grants you permission to modify or distribute the Program
- or its derivative works. These actions are prohibited by law if you do not
- accept this License. Therefore, by modifying or distributing the Program (or any
- work based on the Program), you indicate your acceptance of this License to do
- so, and all its terms and conditions for copying, distributing or modifying the
- Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the Program),
- the recipient automatically receives a license from the original licensor to
- copy, distribute or modify the Program subject to these terms and conditions.
- You may not impose any further restrictions on the recipients' exercise of the
- rights granted herein. You are not responsible for enforcing compliance by third
- parties to this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent issues), conditions
- are imposed on you (whether by court order, agreement or otherwise) that
- contradict the conditions of this License, they do not excuse you from the
- conditions of this License. If you cannot distribute so as to satisfy
- simultaneously your obligations under this License and any other pertinent
- obligations, then as a consequence you may not distribute the Program at all.
- For example, if a patent license would not permit royalty-free redistribution of
- the Program by all those who receive copies directly or indirectly through you,
- then the only way you could satisfy both it and this License would be to refrain
- entirely from distribution of the Program.
-
- If any portion of this section is held invalid or unenforceable under any
- particular circumstance, the balance of the section is intended to apply and the
- section as a whole is intended to apply in other circumstances.
-
- It is not the purpose of this section to induce you to infringe any patents or
- other property right claims or to contest validity of any such claims; this
- section has the sole purpose of protecting the integrity of the free software
- distribution system, which is implemented by public license practices. Many
- people have made generous contributions to the wide range of software
- distributed through that system in reliance on consistent application of that
- system; it is up to the author/donor to decide if he or she is willing to
- distribute software through any other system and a licensee cannot impose that
- choice.
-
- This section is intended to make thoroughly clear what is believed to be a
- consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in certain
- countries either by patents or by copyrighted interfaces, the original copyright
- holder who places the Program under this License may add an explicit
- geographical distribution limitation excluding those countries, so that
- distribution is permitted only in or among countries not thus excluded. In such
- case, this License incorporates the limitation as if written in the body of this
- License.
-
- 9. The Free Software Foundation may publish revised and/or new versions of the
- General Public License from time to time. Such new versions will be similar in
- spirit to the present version, but may differ in detail to address new problems
- or concerns.
-
- Each version is given a distinguishing version number. If the Program
- specifies a version number of this License which applies to it and "any later
- version", you have the option of following the terms and conditions either of
- that version or of any later version published by the Free Software Foundation.
- If the Program does not specify a version number of this License, you may choose
- any version ever published by the Free Software Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free programs
- whose distribution conditions are different, write to the author to ask for
- permission. For software which is copyrighted by the Free Software Foundation,
- write to the Free Software Foundation; we sometimes make exceptions for this.
- Our decision will be guided by the two goals of preserving the free status of
- all derivatives of our free software and of promoting the sharing and reuse of
- software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
- THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
- STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
- "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
- PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
- ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
- ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
- PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
- SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
- TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
- RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
- THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
- PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
- Certain source files distributed by Oracle are subject to the following
- clarification and special exception to the GPL Version 2, but only where Oracle
- has expressly included in the particular source file's header the words "Oracle
- designates this particular file as subject to the "Classpath" exception as
- provided by Oracle in the License file that accompanied this code."
-
- Linking this library statically or dynamically with other modules is making a
- combined work based on this library. Thus, the terms and conditions of the GNU
- General Public License Version 2 cover the whole combination.
-
- As a special exception, the copyright holders of this library give you
- permission to link this library with independent modules to produce an
- executable, regardless of the license terms of these independent modules, and to
- copy and distribute the resulting executable under terms of your choice,
- provided that you also meet, for each linked independent module, the terms and
- conditions of the license of that module. An independent module is a module
- which is not derived from or based on this library. If you modify this library,
- you may extend this exception to your version of the library, but you are not
- obligated to do so. If you do not wish to do so, delete this exception
- statement from your version.
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion REST Server bundles Java Servlet API
-software which is available under dual CDDL1.0 and GPL2 License.
-https://java.net/projects/servlet-spec
-https://glassfish.java.net/nonav/public/CDDL+GPL.html
-
- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
- 1. Definitions.
-
- 1.1. \u201cContributor\u201d means each individual or entity that creates or contributes
- to the creation of Modifications.
-
- 1.2. \u201cContributor Version\u201d means the combination of the Original Software,
- prior Modifications used by a Contributor (if any), and the Modifications made
- by that particular Contributor.
-
- 1.3. \u201cCovered Software\u201d means (a) the Original Software, or (b) Modifications,
- or (c) the combination of files containing Original Software with files
- containing Modifications, in each case including portions thereof.
-
- 1.4. \u201cExecutable\u201d means the Covered Software in any form other than Source Code.
-
- 1.5. \u201cInitial Developer\u201d means the individual or entity that first makes
- Original Software available under this License.
-
- 1.6. \u201cLarger Work\u201d means a work which combines Covered Software or portions
- thereof with code not governed by the terms of this License.
-
- 1.7. \u201cLicense\u201d means this document.
-
- 1.8. \u201cLicensable\u201d means having the right to grant, to the maximum extent
- possible, whether at the time of the initial grant or subsequently acquired, any
- and all of the rights conveyed herein.
-
- 1.9. \u201cModifications\u201d means the Source Code and Executable form of any of the
- following:
-
- A. Any file that results from an addition to, deletion from or modification of
- the contents of a file containing Original Software or previous Modifications;
-
- B. Any new file that contains any part of the Original Software or previous
- Modification; or
-
- C. Any new file that is contributed or otherwise made available under the
- terms of this License.
-
- 1.10. \u201cOriginal Software\u201d means the Source Code and Executable form of
- computer software code that is originally released under this License.
-
- 1.11. \u201cPatent Claims\u201d means any patent claim(s), now owned or hereafter
- acquired, including without limitation, method, process, and apparatus claims,
- in any patent Licensable by grantor.
-
- 1.12. \u201cSource Code\u201d means (a) the common form of computer software code in
- which modifications are made and (b) associated documentation included in or
- with such code.
-
- 1.13. \u201cYou\u201d (or \u201cYour\u201d) means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License. For legal
- entities, \u201cYou\u201d includes any entity which controls, is controlled by, or is
- under common control with You. For purposes of this definition, \u201ccontrol\u201d means
- (a) the power, direct or indirect, to cause the direction or management of such
- entity, whether by contract or otherwise, or (b) ownership of more than fifty
- percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to third
- party intellectual property claims, the Initial Developer hereby grants You a
- world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Initial Developer, to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or portions thereof), with or
- without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of Original
- Software, to make, have made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date
- Initial Developer first distributes or otherwise makes the Original Software
- available to a third party under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1)
- for code that You delete from the Original Software, or (2) for infringements
- caused by: (i) the modification of the Original Software, or (ii) the
- combination of the Original Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and subject to third
- party intellectual property claims, each Contributor hereby grants You a
- world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Contributor to use, reproduce, modify, display, perform,
- sublicense and distribute the Modifications created by such Contributor (or
- portions thereof), either on an unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in combination with
- its Contributor Version (or portions of such combination), to make, use, sell,
- offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
- by that Contributor (or portions thereof); and (2) the combination of
- Modifications made by that Contributor with its Contributor Version (or portions
- of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
- date Contributor first distributes or otherwise makes the Modifications
- available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1)
- for any code that Contributor has deleted from the Contributor Version; (2) for
- infringements caused by: (i) third party modifications of Contributor Version,
- or (ii) the combination of Modifications made by that Contributor with other
- software (except as part of the Contributor Version) or other devices; or (3)
- under Patent Claims infringed by Covered Software in the absence of
- Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make available in
- Executable form must also be made available in Source Code form and that Source
- Code form must be distributed only under the terms of this License. You must
- include a copy of this License with every copy of the Source Code form of the
- Covered Software You distribute or otherwise make available. You must inform
- recipients of any such Covered Software in Executable form as to how they can
- obtain such Covered Software in Source Code form in a reasonable manner on or
- through a medium customarily used for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You contribute are governed by
- the terms of this License. You represent that You believe Your Modifications are
- Your original creation(s) and/or You have sufficient rights to grant the rights
- conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications that identifies You as
- the Contributor of the Modification. You may not remove or alter any copyright,
- patent or trademark notices contained within the Covered Software, or any
- notices of licensing or any descriptive text giving attribution to any
- Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered Software in Source Code
- form that alters or restricts the applicable version of this License or the
- recipients\u2019 rights hereunder. You may choose to offer, and to charge a fee for,
- warranty, support, indemnity or liability obligations to one or more recipients
- of Covered Software. However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You must make it absolutely
- clear that any such warranty, support, indemnity or liability obligation is
- offered by You alone, and You hereby agree to indemnify the Initial Developer
- and every Contributor for any liability incurred by the Initial Developer or
- such Contributor as a result of warranty, support, indemnity or liability terms
- You offer.
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered Software under the terms
- of this License or under the terms of a license of Your choice, which may
- contain terms different from this License, provided that You are in compliance
- with the terms of this License and that the license for the Executable form does
- not attempt to limit or alter the recipient\u2019s rights in the Source Code form
- from the rights set forth in this License. If You distribute the Covered
- Software in Executable form under a different license, You must make it
- absolutely clear that any terms which differ from this License are offered by
- You alone, not by the Initial Developer or Contributor. You hereby agree to
- indemnify the Initial Developer and every Contributor for any liability incurred
- by the Initial Developer or such Contributor as a result of any such terms You
- offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software with other code not
- governed by the terms of this License and distribute the Larger Work as a single
- product. In such a case, You must make sure the requirements of this License are
- fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions.
-
- Sun Microsystems, Inc. is the initial license steward and may publish revised
- and/or new versions of this License from time to time. Each version will be
- given a distinguishing version number. Except as provided in Section 4.3, no one
- other than the license steward has the right to modify this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise make the Covered
- Software available under the terms of the version of the License under which You
- originally received the Covered Software. If the Initial Developer includes a
- notice in the Original Software prohibiting it from being distributed or
- otherwise made available under any subsequent version of the License, You must
- distribute and make the Covered Software available under the terms of the
- version of the License under which You originally received the Covered Software.
- Otherwise, You may also choose to use, distribute or otherwise make the Covered
- Software available under the terms of any subsequent version of the License
- published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a new license for
- Your Original Software, You may create and use a modified version of this
- License if You: (a) rename the license and remove any references to the name of
- the license steward (except to note that the license differs from this License);
- and (b) otherwise make it clear that the license contains terms which differ
- from this License.
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN \u201cAS IS\u201d BASIS, WITHOUT
- WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
- LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
- MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS
- TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
- COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER
- OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
- CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- THIS DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure such
- breach within 30 days of becoming aware of the breach. Provisions which, by
- their nature, must remain in effect beyond the termination of this License shall
- survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory judgment
- actions) against Initial Developer or a Contributor (the Initial Developer or
- Contributor against whom You assert such claim is referred to as \u201cParticipant\u201d)
- alleging that the Participant Software (meaning the Contributor Version where
- the Participant is a Contributor or the Original Software where the Participant
- is the Initial Developer) directly or indirectly infringes any patent, then any
- and all rights granted directly or indirectly to You by such Participant, the
- Initial Developer (if the Initial Developer is not the Participant) and all
- Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
- notice from Participant terminate prospectively and automatically at the
- expiration of such 60 day notice period, unless if within such 60 day period You
- withdraw Your claim with respect to the Participant Software against such
- Participant either unilaterally or pursuant to a written agreement with
- Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user
- licenses that have been validly granted by You or any distributor hereunder
- prior to termination (excluding licenses granted to You by any distributor)
- shall survive termination.
-
- 7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
- NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
- CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF
- SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
- FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
- MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH
- PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS
- LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
- INJURY RESULTING FROM SUCH PARTY\u2019S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
- LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
- LIMITATION MAY NOT APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a \u201ccommercial item,\u201d as that term is defined in 48
- C.F.R. 2.101 (Oct. 1995), consisting of \u201ccommercial computer software\u201d (as that
- term is defined at 48 C.F.R. � 252.227-7014(a)(1)) and \u201ccommercial computer
- software documentation\u201d as such terms are used in 48 C.F.R. 12.212 (Sept. 1995).
- Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
- (June 1995), all U.S. Government End Users acquire Covered Software with only
- those rights set forth herein. This U.S. Government Rights clause is in lieu of,
- and supersedes, any other FAR, DFAR, or other clause or provision that addresses
- Government rights in computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject matter
- hereof. If any provision of this License is held to be unenforceable, such
- provision shall be reformed only to the extent necessary to make it enforceable.
- This License shall be governed by the law of the jurisdiction specified in a
- notice contained within the Original Software (except to the extent applicable
- law, if any, provides otherwise), excluding such jurisdiction\u2019s conflict-of-law
- provisions. Any litigation relating to this License shall be subject to the
- jurisdiction of the courts located in the jurisdiction and venue specified in a
- notice contained within the Original Software, with the losing party responsible
- for costs, including, without limitation, court costs and reasonable attorneys\u2019
- fees and expenses. The application of the United Nations Convention on Contracts
- for the International Sale of Goods is expressly excluded. Any law or regulation
- which provides that the language of a contract shall be construed against the
- drafter shall not apply to this License. You agree that You alone are
- responsible for compliance with the United States export administration
- regulations (and the export control laws and regulation of any other countries)
- when You use, distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is responsible
- for claims and damages arising, directly or indirectly, out of its utilization
- of rights under this License and You agree to work with Initial Developer and
- Contributors to distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-
- The code released under the CDDL shall be governed by the laws of the State of
- California (excluding conflict-of-law provisions). Any litigation relating to
- this License shall be subject to the jurisdiction of the Federal Courts of the
- Northern District of California and the state courts of the State of California,
- with venue lying in Santa Clara County, California.
-
- The GNU General Public License (GPL) Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite
- 330, Boston, MA 02111-1307 USA
-
- Everyone is permitted to copy and distribute verbatim copies of this license
- document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your freedom to share
- and change it. By contrast, the GNU General Public License is intended to
- guarantee your freedom to share and change free software--to make sure the
- software is free for all its users. This General Public License applies to most
- of the Free Software Foundation's software and to any other program whose
- authors commit to using it. (Some other Free Software Foundation software is
- covered by the GNU Library General Public License instead.) You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not price. Our
- General Public Licenses are designed to make sure that you have the freedom to
- distribute copies of free software (and charge for this service if you wish),
- that you receive source code or can get it if you want it, that you can change
- the software or use pieces of it in new free programs; and that you know you can
- do these things.
-
- To protect your rights, we need to make restrictions that forbid anyone to
- deny you these rights or to ask you to surrender the rights. These restrictions
- translate to certain responsibilities for you if you distribute copies of the
- software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether gratis or for
- a fee, you must give the recipients all the rights that you have. You must make
- sure that they, too, receive or can get the source code. And you must show them
- these terms so they know their rights.
-
- We protect your rights with two steps: (1) copyright the software, and (2)
- offer you this license which gives you legal permission to copy, distribute
- and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain that
- everyone understands that there is no warranty for this free software. If the
- software is modified by someone else and passed on, we want its recipients to
- know that what they have is not the original, so that any problems introduced by
- others will not reflect on the original authors' reputations.
-
- Finally, any free program is threatened constantly by software patents. We
- wish to avoid the danger that redistributors of a free program will individually
- obtain patent licenses, in effect making the program proprietary. To prevent
- this, we have made it clear that any patent must be licensed for everyone's free
- use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and modification
- follow.
-
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains a notice
- placed by the copyright holder saying it may be distributed under the terms of
- this General Public License. The "Program", below, refers to any such program or
- work, and a "work based on the Program" means either the Program or any
- derivative work under copyright law: that is to say, a work containing the
- Program or a portion of it, either verbatim or with modifications and/or
- translated into another language. (Hereinafter, translation is included without
- limitation in the term "modification".) Each licensee is addressed as "you".
-
- Activities other than copying, distribution and modification are not covered
- by this License; they are outside its scope. The act of running the Program is
- not restricted, and the output from the Program is covered only if its contents
- constitute a work based on the Program (independent of having been made by
- running the Program). Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's source code as
- you receive it, in any medium, provided that you conspicuously and appropriately
- publish on each copy an appropriate copyright notice and disclaimer of warranty;
- keep intact all the notices that refer to this License and to the absence of any
- warranty; and give any other recipients of the Program a copy of this License
- along with the Program.
-
- You may charge a fee for the physical act of transferring a copy, and you may
- at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion of it,
- thus forming a work based on the Program, and copy and distribute such
- modifications or work under the terms of Section 1 above, provided that you also
- meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices stating that
- you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in whole or in
- part contains or is derived from the Program or any part thereof, to be licensed
- as a whole at no charge to all third parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively when run, you
- must cause it, when started running for such interactive use in the most
- ordinary way, to print or display an announcement including an appropriate
- copyright notice and a notice that there is no warranty (or else, saying that
- you provide a warranty) and that users may redistribute the program under these
- conditions, and telling the user how to view a copy of this License. (Exception:
- if the Program itself is interactive but does not normally print such an
- announcement, your work based on the Program is not required to print an
- announcement.)
-
- These requirements apply to the modified work as a whole. If identifiable
- sections of that work are not derived from the Program, and can be reasonably
- considered independent and separate works in themselves, then this License, and
- its terms, do not apply to those sections when you distribute them as separate
- works. But when you distribute the same sections as part of a whole which is a
- work based on the Program, the distribution of the whole must be on the terms of
- this License, whose permissions for other licensees extend to the entire whole,
- and thus to each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest your
- rights to work written entirely by you; rather, the intent is to exercise the
- right to control the distribution of derivative or collective works based on the
- Program.
-
- In addition, mere aggregation of another work not based on the Program with
- the Program (or with a work based on the Program) on a volume of a storage or
- distribution medium does not bring the other work under the scope of this
- License.
-
- 3. You may copy and distribute the Program (or a work based on it, under
- Section 2) in object code or executable form under the terms of Sections 1 and 2
- above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable source code,
- which must be distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three years, to give
- any third party, for a charge no more than your cost of physically performing
- source distribution, a complete machine-readable copy of the corresponding
- source code, to be distributed under the terms of Sections 1 and 2 above on a
- medium customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer to
- distribute corresponding source code. (This alternative is allowed only for
- noncommercial distribution and only if you received the program in object code
- or executable form with such an offer, in accord with Subsection b above.)
-
- The source code for a work means the preferred form of the work for making
- modifications to it. For an executable work, complete source code means all the
- source code for all modules it contains, plus any associated interface
- definition files, plus the scripts used to control compilation and installation
- of the executable. However, as a special exception, the source code distributed
- need not include anything that is normally distributed (in either source or
- binary form) with the major components (compiler, kernel, and so on) of the
- operating system on which the executable runs, unless that component itself
- accompanies the executable.
-
- If distribution of executable or object code is made by offering access to
- copy from a designated place, then offering equivalent access to copy the source
- code from the same place counts as distribution of the source code, even though
- third parties are not compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program except as
- expressly provided under this License. Any attempt otherwise to copy, modify,
- sublicense or distribute the Program is void, and will automatically terminate
- your rights under this License. However, parties who have received copies, or
- rights, from you under this License will not have their licenses terminated so
- long as such parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not signed it.
- However, nothing else grants you permission to modify or distribute the Program
- or its derivative works. These actions are prohibited by law if you do not
- accept this License. Therefore, by modifying or distributing the Program (or any
- work based on the Program), you indicate your acceptance of this License to do
- so, and all its terms and conditions for copying, distributing or modifying the
- Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the Program),
- the recipient automatically receives a license from the original licensor to
- copy, distribute or modify the Program subject to these terms and conditions.
- You may not impose any further restrictions on the recipients' exercise of the
- rights granted herein. You are not responsible for enforcing compliance by third
- parties to this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent issues), conditions
- are imposed on you (whether by court order, agreement or otherwise) that
- contradict the conditions of this License, they do not excuse you from the
- conditions of this License. If you cannot distribute so as to satisfy
- simultaneously your obligations under this License and any other pertinent
- obligations, then as a consequence you may not distribute the Program at all.
- For example, if a patent license would not permit royalty-free redistribution of
- the Program by all those who receive copies directly or indirectly through you,
- then the only way you could satisfy both it and this License would be to refrain
- entirely from distribution of the Program.
-
- If any portion of this section is held invalid or unenforceable under any
- particular circumstance, the balance of the section is intended to apply and the
- section as a whole is intended to apply in other circumstances.
-
- It is not the purpose of this section to induce you to infringe any patents or
- other property right claims or to contest validity of any such claims; this
- section has the sole purpose of protecting the integrity of the free software
- distribution system, which is implemented by public license practices. Many
- people have made generous contributions to the wide range of software
- distributed through that system in reliance on consistent application of that
- system; it is up to the author/donor to decide if he or she is willing to
- distribute software through any other system and a licensee cannot impose that
- choice.
-
- This section is intended to make thoroughly clear what is believed to be a
- consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in certain
- countries either by patents or by copyrighted interfaces, the original copyright
- holder who places the Program under this License may add an explicit
- geographical distribution limitation excluding those countries, so that
- distribution is permitted only in or among countries not thus excluded. In such
- case, this License incorporates the limitation as if written in the body of this
- License.
-
- 9. The Free Software Foundation may publish revised and/or new versions of the
- General Public License from time to time. Such new versions will be similar in
- spirit to the present version, but may differ in detail to address new problems
- or concerns.
-
- Each version is given a distinguishing version number. If the Program
- specifies a version number of this License which applies to it and "any later
- version", you have the option of following the terms and conditions either of
- that version or of any later version published by the Free Software Foundation.
- If the Program does not specify a version number of this License, you may choose
- any version ever published by the Free Software Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free programs
- whose distribution conditions are different, write to the author to ask for
- permission. For software which is copyrighted by the Free Software Foundation,
- write to the Free Software Foundation; we sometimes make exceptions for this.
- Our decision will be guided by the two goals of preserving the free status of
- all derivatives of our free software and of promoting the sharing and reuse of
- software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
- THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
- STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
- "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
- PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
- ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
- ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
- PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
- SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY
- TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
- RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
- THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
- PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
- Certain source files distributed by Sun Microsystems, Inc. are subject to the
- following clarification and special exception to the GPL Version 2, but only
- where Sun has expressly included in the particular source file's header the
- words "Sun designates this particular file as subject to the "Classpath"
- exception as provided by Sun in the License file that accompanied this code."
-
- Linking this library statically or dynamically with other modules is making a
- combined work based on this library. Thus, the terms and conditions of the GNU
- General Public License Version 2 cover the whole combination.
-
- As a special exception, the copyright holders of this library give you
- permission to link this library with independent modules to produce an
- executable, regardless of the license terms of these independent modules, and to
- copy and distribute the resulting executable under terms of your choice,
- provided that you also meet, for each linked independent module, the terms and
- conditions of the license of that module.? An independent module is a module
- which is not derived from or based on this library.? If you modify this library,
- you may extend this exception to your version of the library, but you are not
- obligated to do so.? If you do not wish to do so, delete this exception
- statement from your version.
-
-+++++++++++++++++++++++++++++
[03/39] incubator-trafodion git commit: Fix for JIRA 1953
Posted by db...@apache.org.
Fix for JIRA 1953
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/67d3e197
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/67d3e197
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/67d3e197
Branch: refs/heads/master
Commit: 67d3e197f4be877a5206e06326009a0f4681a5a8
Parents: 5dc6754
Author: Venkat Muthuswamy <ve...@esgyn.com>
Authored: Wed Apr 27 21:47:22 2016 -0700
Committer: Venkat Muthuswamy <ve...@esgyn.com>
Committed: Wed Apr 27 21:47:22 2016 -0700
----------------------------------------------------------------------
core/rest/pom.xml | 6 +++++-
core/rest/src/assembly/all.xml | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/67d3e197/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index ab36f7c..5f7b478 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -520,7 +520,11 @@
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<!-- REST dependencies -->
<dependency>
<groupId>com.sun.jersey</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/67d3e197/core/rest/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/assembly/all.xml b/core/rest/src/assembly/all.xml
index ba9df23..461db05 100644
--- a/core/rest/src/assembly/all.xml
+++ b/core/rest/src/assembly/all.xml
@@ -83,6 +83,7 @@ http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifi
<include>org.eclipse.jetty:jetty-http</include>
<include>org.eclipse.jetty:jetty-io</include>
<include>org.eclipse.jetty:jetty-server</include>
+ <include>org.eclipse.jetty:jetty-security</include>
<include>javax.servlet:javax.servlet-api</include>
<include>com.sun.jersey:jersey-server</include>
<include>com.sun.jersey:jersey-json</include>
[20/39] incubator-trafodion git commit: Fixes for TRAFODION-1985
Posted by db...@apache.org.
Fixes for TRAFODION-1985
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/10adf4b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/10adf4b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/10adf4b5
Branch: refs/heads/master
Commit: 10adf4b56251543ac73705e3ecc61e1646e37ead
Parents: 7b5e5ea
Author: Amanda Moran <am...@apache.com>
Authored: Tue May 10 22:49:36 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Tue May 10 22:49:36 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 17 +--
install/installer/rest_installer | 18 +--
install/installer/traf_apache_mods | 2 +-
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +++++-----
install/installer/traf_config_check | 38 ++++--
install/installer/traf_config_setup | 69 ++---------
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
install/installer/trafodion_config_default | 14 +--
install/installer/trafodion_install | 148 +++++++-----------------
11 files changed, 139 insertions(+), 237 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index b07a748..cf5e744 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -67,7 +67,6 @@ function checkOpts {
typeset DCS_BUILD_FILE=""
typeset DCS_INSTALL_PATH="$MY_SQROOT"
typeset DCS_SERVER_COUNT=""
-typeset REQUIRED_OPTIONS="DCS_BUILD_FILE"
# Parse input parameters
while [[ $# -gt 0 ]]; do
@@ -131,14 +130,18 @@ fi
mkdir -p $DCS_INSTALL_PATH
cd $DCS_INSTALL_PATH
-# untar DCS build into install directory
-echo "***INFO: untarring build file $DCS_BUILD_FILE"
-tar -xzf $DCS_BUILD_FILE
+if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
+ DCS_DIR="$SQ_ROOT/dcs*"
+else
+ # untar DCS build into install directory
+ echo "***INFO: untarring build file $DCS_BUILD_FILE"
+ tar -xzf $DCS_BUILD_FILE
-# get the dcs install directory name which is imbedded in the tar file
-DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
+ # get the dcs install directory name which is imbedded in the tar file
+ DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
-DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
+ DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
+fi
# set env var in sqenvcom.sh for DCS install directory
grep --invert-match "DCS_INSTALL_DIR=" $MY_SQROOT/sqenvcom.sh > $MY_SQROOT/sqenvcom.temp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index 5ecf6f5..e3cde2e 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -93,13 +93,17 @@ fi
mkdir -p $REST_INSTALL_PATH
cd $REST_INSTALL_PATH
-# untar REST build into install directory
-echo "***INFO: untarring build file $REST_BUILD_FILE"
-tar -xzf $REST_BUILD_FILE
-
-# get the REST install directory name which is imbedded in the tar file
-REST_DIR=$(tar -tf $REST_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
-REST_DIR=$REST_INSTALL_PATH/$REST_DIR
+if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
+ REST_DIR="$SQ_ROOT/rest*"
+else
+ # untar REST build into install directory
+ echo "***INFO: untarring build file $REST_BUILD_FILE"
+ tar -xzf $REST_BUILD_FILE
+
+ # get the REST install directory name which is imbedded in the tar file
+ REST_DIR=$(tar -tf $REST_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@")
+ REST_DIR=$REST_INSTALL_PATH/$REST_DIR
+fi
# set env var in sqenvcom.sh for DCS install directory
grep --invert-match "REST_INSTALL_DIR=" $MY_SQROOT/sqenvcom.sh > $MY_SQROOT/sqenvcom.temp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_apache_mods
----------------------------------------------------------------------
diff --git a/install/installer/traf_apache_mods b/install/installer/traf_apache_mods
index 35bbfcc..cf16918 100755
--- a/install/installer/traf_apache_mods
+++ b/install/installer/traf_apache_mods
@@ -48,7 +48,7 @@ sudo chmod 777 $TRAF_CONFIG
source $TRAF_CONFIG
-hbase_trx_jar="hbase-trx-apache1_0_2-2.0.0.jar"
+hbase_trx_jar="hbase-trx-apache*.jar"
traf_util_jar="trafodion-utility-*.jar"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_cloudera_mods
----------------------------------------------------------------------
diff --git a/install/installer/traf_cloudera_mods b/install/installer/traf_cloudera_mods
index 2f98efa..f949cb6 100755
--- a/install/installer/traf_cloudera_mods
+++ b/install/installer/traf_cloudera_mods
@@ -235,7 +235,7 @@ curl -k -X PUT -H 'Content-Type:application/json' -u $ADMIN:$PASSWORD --data \
"roleType" : "MASTER",
"items" : [ {
"name" : "hbase_master_config_safety_valve",
- "value" : "<property>\r\n <name>hbase.master.distributed.log.splitting</name>\r\n <value>false</value>\r\n</property>\r\n <property>\r\n <name>hbase.snapshot.master.timeoutMillis</name>\r\n <value>600000</value>\r\n</property>\r\n"
+ "value" : "<property>\r\n <name>hbase.master.distributed.log.splitting</name>\r\n <value>true</value>\r\n</property>\r\n <property>\r\n <name>hbase.snapshot.master.timeoutMillis</name>\r\n <value>600000</value>\r\n</property>\r\n"
} ]
}, {
"roleType" : "REGIONSERVER",
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index 7bffc03..a765e53 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -39,27 +39,10 @@ export PDCP="pdcp -R ssh"
TRAF_CONFIG=/etc/trafodion/trafodion_config
source $TRAF_CONFIG
-#============================================
-
-#Info for log file
-
-echo "***INFO: Log file location $INSTALL_LOG"
-
-echo "***INFO: ***Log File: traf_config script***" >> $INSTALL_LOG
-echo >> $INSTALL_LOG
-echo "***INFO: Working directory: $TRAF_WORKDIR" >> $INSTALL_LOG
-echo "***INFO: Build: $BUILD_FILE" >> $INSTALL_LOG
-echo "***INFO: Install Path: $SQ_ROOT" >> $INSTALL_LOG
-echo "***INFO: DCS Build: $DCS_BUILD" >> $INSTALL_LOG
-echo "***INFO: Path to SQCONFIG: $SQCONFIG" >> $INSTALL_LOG
-echo "***INFO: Number of DCS Servers: $DCS_SERVERS_PARM" >> $INSTALL_LOG
-echo "***INFO: Run init_trafodion: $INIT_TRAFODION" >> $INSTALL_LOG
-echo "***INFO: Start Trafodion: $START" >> $INSTALL_LOG
-echo "***INFO: User Id: $USER_NAME" >> $INSTALL_LOG
-echo "***INFO: Hadoop UI URL: $URL_PORT" >> $INSTALL_LOG
-echo >> $INSTALL_LOG
+export traf_filename=$(basename "$TRAF_PACKAGE")
#============================================
+
# Check if logged in as trafodion
userId=$(whoami)
@@ -72,12 +55,6 @@ if [[ "$userId" != "$TRAF_USER" ]]; then
fi
#============================================
-echo "*************************"
-echo "*************************"
-echo " Trafodion Configuration"
-echo "*************************"
-echo "*************************"
-#============================================
# Check if an existing instance is up
process_count=$(cstat -noheader 2>/dev/null | wc -l)
if [ "$process_count" -ne 0 ]; then
@@ -101,10 +78,15 @@ fi
cd $SQ_ROOT
# untar Trafodion build into install directory
-echo "***INFO: untarring build file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
-tar -xzf $TRAF_BUILD 2>&1 | tee -a $INSTALL_LOG
+if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
+ echo "***INFO: untarring file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
+ tar -xzf $TRAF_BUILD 2>&1 | tee -a $INSTALL_LOG
+else
+ echo "***INFO: untarring file $TRAF_BUILD to $SQ_ROOT" | tee -a $INSTALL_LOG
+ tar -xzf $UNTAR_DIR/$traf_filename 2>&1 | tee -a $INSTALL_LOG
+fi
if [ "$?" != "0" ]; then
- echo "***ERROR: There was a problem untarring the Trafodion build file. Check install log files for details." | tee -a $INSTALL_LOG
+ echo "***ERROR: There was a problem untarring Trafodion tar file. Check install log files for details." | tee -a $INSTALL_LOG
exit -1;
fi
@@ -197,7 +179,12 @@ fi
#==========================================
# install dcs
-$TRAF_WORKDIR/installer/dcs_installer --dcs_build $DCS_BUILD --dcs_servers $DCS_SERVERS_PARM
+if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
+ $TRAF_WORKDIR/installer/dcs_installer --dcs_build $DCS_BUILD --dcs_servers $DCS_SERVERS_PARM
+else
+ $TRAF_WORKDIR/installer/dcs_installer --dcs_servers $DCS_SERVERS_PARM
+fi
+
if [ "$?" != "0" ]; then
echo "***ERROR: DCS install failed. Check install log files for details." | tee -a $INSTALL_LOG
exit -1;
@@ -206,12 +193,21 @@ fi
#==========================================
# install REST Server
-if [ ! -z $REST_BUILD ]; then
- $TRAF_WORKDIR/installer/rest_installer --rest_build $REST_BUILD
+if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
+ if [ ! -z $REST_BUILD ]; then
+ $TRAF_WORKDIR/installer/rest_installer --rest_build $REST_BUILD
+ if [ "$?" != "0" ]; then
+ echo "***ERROR: REST Server install failed. Check install log files for details." | tee -a $INSTALL_LOG
+ exit -1;
+ fi
+ fi
+else
+ $TRAF_WORKDIR/installer/rest_installer
if [ "$?" != "0" ]; then
- echo "***ERROR: REST Server install failed. Check install log files for details." | tee -a $INSTALL_LOG
- exit -1;
+ echo "***ERROR: REST Server install failed. Check install log files for details." | tee -a $INSTALL_LOG
+ exit -1;
fi
fi
+
#==========================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 6bf3760..dd883f0 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -413,13 +413,7 @@ else
#Checking if using 1.7.0_n
if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
- #If Java is **less** than than 1.7.0_65 the next command will fail.
- #Install will fail anyways if less than 1.7.0_65
- #Will not fail if Java is 1.7.0_100 or greater
- #Temporary fix to support Java 7 upgrades greater than 100
- if [[ "${THIS_JVM_VER:20:3}" -lt $JAVA_65 ]]; then
- error="true"
- fi
+ error="true"
fi
fi
@@ -435,7 +429,7 @@ else
hadoopPath="$HADOOP_PATH"
hadoopBinPath="$HADOOP_BIN_PATH"
- export PATH="$PATH:$JAVA_HOME/bin"
+ export PATH="$JAVA_HOME/bin:$PATH"
sudo chmod 777 $TRAF_CONFIG
sed -i '/PATH\=/d' $TRAF_CONFIG
echo "export PATH=\"$PATH\"" >>$TRAF_CONFIG
@@ -608,6 +602,10 @@ function setPath {
export PATH=$PATH:$HADOOP_PREFIX/bin:$HADOOP_PREFIX/sbin:$HBASE_HOME/bin
+if [ ! -z $HIVE_HOME ]; then
+ export PATH=$PATH:$HIVE_HOME/bin
+fi
+
sudo chmod 777 $TRAF_CONFIG
sed -i '/PATH\=/d' $TRAF_CONFIG
echo "export PATH=\"$PATH\"" >> $TRAF_CONFIG
@@ -911,19 +909,35 @@ fi
function checkHadoopSupport {
-if [[ -z $TRAF_BUILD ]] || [[ ! -e $TRAF_BUILD ]] ; then
+if [[ "$ONE_TAR_INSTALL" == "N" ]] || [[ -z "$ONE_TAR_INSTALL" ]] ; then
TRAF_BUILD=$(tar -tf $TRAF_PACKAGE | grep "trafodion_.*server")
tar -xzf $TRAF_PACKAGE --directory $LOCAL_WORKDIR
TRAF_BUILD_PATH=$LOCAL_WORKDIR/$TRAF_BUILD
+ install_features_path=$(tar -tf $TRAF_BUILD_PATH | grep "install_features")
+
else
- TRAF_BUILD_PATH=$TRAF_BUILD
+ TRAF_BUILD_PATH=$TRAF_PACKAGE
+ install_features_path=$(tar -tf $TRAF_PACKAGE | grep "install_features")
+
fi
-install_features_path=$(tar -tf $TRAF_BUILD_PATH | grep "install_features")
if [[ ! -z $install_features_path ]]; then
- tar -xzf $TRAF_BUILD_PATH $install_features_path
+ if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
+ tar -xzf $TRAF_BUILD_PATH $install_features_path
+ if [[ $? -ne "0" ]]; then
+ echo "***ERROR: Error with untar of $TRAF_BUILD_PATH"
+ exit -1
+ fi
+ else
+ tar -xzf $TRAF_PACKAGE $install_features_path
+ if [[ $? -ne "0" ]]; then
+ echo "***ERROR: Error with untar of $TRAF_BUILD_PATH"
+ exit -1
+ fi
+ fi
source $install_features_path
+
sudo chmod 777 $TRAF_CONFIG
echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
sudo chmod 777 $TRAF_CONFIG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 7256969..e83f19c 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -301,7 +301,7 @@ echo "export JAVA_HOME=\"$JAVA_HOME\"" >> $LOCAL_TRAF_CONFIG
# TRAF_PACKAGE = the trafodion package tar file which contains trafodion core & dcs
# TRAF_BUILD = the trafodion core tar file extracted from the trafodion package
# DCS_BUILD = the dcs tar file extracted from the trafodion package
-
+# 05/10/2016
if [ -z "$TRAF_PACKAGE" ]; then
TRAF_DEFAULT="$TRAF_BUILD"
else
@@ -328,67 +328,20 @@ if [ ! -f $TRAF_PACKAGE ]; then
exit -1
fi
-# Determine if we have a package or just the trafodion_server tar file
-# Normally, the package file is what should be specified but because
-# we used to not support the package file and required the trafodion core
-# tar file previous users might still specify the trafodion core tar file instead
-# Also, developers might only have trafodion core tar file and not a package
-# tar file.
+# Determine if we have a package that was created before 05/10/2016.
+# Tar files created after 05/10/2016 are no longer a tar of tar packages
+# but just one tar file.
+
package=$(tar -tzf $TRAF_PACKAGE | grep build-version.txt | wc -l )
if [ $package -eq 0 ]; then
- # assume user specified a trafodion core tar file
- UTT_INSTALL="Y"
- TRAF_BUILD=$TRAF_PACKAGE
- TRAF_PACKAGE=""
-
- #TODO: do a quick sanity check on the file to make sure it is a traf build tar file
-
- echo "***INFO: tar file is not a package tar file which includes Trafodion & DCS"
- echo "***INFO: assuming it is a Trafodion build only tar file"
-
- # since it is not a package tar file, we'll need to prompt for the DCS build file
- echo -n "Enter location of DCS tar file [$DCS_BUILD]: "
- read answer
- if [ -z $answer ]; then
- if [ -z $DCS_BUILD ]; then
- echo "***ERROR: Must specify DCS tar file location."
- exit -1
- fi
- else
- DCS_BUILD=$answer
- fi
-
- # make sure file exists
- if [ ! -f $DCS_BUILD ]; then
- echo "***ERROR: $DCS_BUILD does not exist"
- exit -1
- fi
- #TODO: do a quick sanity check on the file to make sure it is a DCS build tar file
-
- # since it is not a package tar file, we'll need to prompt for the rest build file
- echo -n "Enter location of REST tar file [$REST_BUILD]: "
- read answer
- if [ -z $answer ]; then
- if [ -z $REST_BUILD ]; then
- echo "***ERROR: Must specify REST tar file location."
- exit -1
- fi
- else
- REST_BUILD=$answer
- fi
-
- # make sure file exists
- if [ ! -f $REST_BUILD ]; then
- echo "***ERROR: $REST_BUILD does not exist"
- exit -1
- fi
-
- #TODO: do a quick sanity check on the file to make sure it is a rest build tar file
-
+ ONE_TAR_INSTALL="Y"
+ TRAF_BUILD=""
+ DCS_BUILD=""
+ REST_BUILD=""
else
# user specifed a package file
- UTT_INSTALL="N"
+ ONE_TAR_INSTALL="N"
TRAF_BUILD=""
DCS_BUILD=""
REST_BUILD=""
@@ -399,7 +352,7 @@ echo "export TRAF_PACKAGE=\"$TRAF_PACKAGE\"" >> $LOCAL_TRAF_CONFIG
echo "export TRAF_BUILD=\"$TRAF_BUILD\"" >> $LOCAL_TRAF_CONFIG
echo "export DCS_BUILD=\"$DCS_BUILD\"" >> $LOCAL_TRAF_CONFIG
echo "export REST_BUILD=\"$REST_BUILD\"" >> $LOCAL_TRAF_CONFIG
-echo "export UTT_INSTALL=\"$UTT_INSTALL\"" >> $LOCAL_TRAF_CONFIG
+echo "export ONE_TAR_INSTALL=\"$ONE_TAR_INSTALL\"" >> $LOCAL_TRAF_CONFIG
#==============================================
#Backup restore user
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_hortonworks_mods
----------------------------------------------------------------------
diff --git a/install/installer/traf_hortonworks_mods b/install/installer/traf_hortonworks_mods
index b1b49d1..67d1ed3 100755
--- a/install/installer/traf_hortonworks_mods
+++ b/install/installer/traf_hortonworks_mods
@@ -186,7 +186,7 @@ ssh -q -n $HDFS_NODE 'rm -rf $HOME/traf_temp_output'
AMBARI_DIR=/var/lib/ambari-server/resources/scripts
cd $LOCAL_WORKDIR
-ssh -q -n $AMBARI_HOST "$AMBARI_DIR"'/configs.sh -u' "$ADMIN" '-p' "$PASSWORD" '-port' "$PORT" 'set' "$AMBARI_HOST" "$CLUSTER_NAME" 'hbase-site hbase.master.distributed.log.splitting false'
+ssh -q -n $AMBARI_HOST "$AMBARI_DIR"'/configs.sh -u' "$ADMIN" '-p' "$PASSWORD" '-port' "$PORT" 'set' "$AMBARI_HOST" "$CLUSTER_NAME" 'hbase-site hbase.master.distributed.log.splitting true'
if [ $? != 0 ]; then
echo "***ERROR: unable to modify hbase.master.distributed.log.splitting through Ambari's configs.sh script."
echo "***ERROR: Check if Ambari URL is correct, may need to enter external IP address."
@@ -566,7 +566,7 @@ if [ $node_count -ne 1 ]; then
cp $TRAF_CONFIG $LOCAL_WORKDIR
$TRAF_PDCP $LOCAL_WORKDIR/$TRAF_CONFIG_FILE $HOME
$TRAF_PDSH sudo mkdir -p $TRAF_CONFIG_DIR
- $TRAF_PDSH sudo cp $HOME/$TRAF_CONFIG_FILE $TRAF_CONFIG_DIR
+ $TRAF_PDSH sudo cp -rf $HOME/$TRAF_CONFIG_FILE $TRAF_CONFIG_DIR
$TRAF_PDSH sudo chmod 777 $TRAF_CONFIG
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/traf_package_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_package_setup b/install/installer/traf_package_setup
index e9cf949..f0e9209 100755
--- a/install/installer/traf_package_setup
+++ b/install/installer/traf_package_setup
@@ -64,6 +64,8 @@ if [[ $SUSE_LINUX == "false" ]]; then
epel_rpm="epel-release-6-8.noarch.rpm"
echo "***INFO: Downloading EPEL repo, since not installed."
+ sudo yum --assumeyes install wget 2>> $YUM_LOG >> $YUM_LOG
+
wget http://download.fedoraproject.org/pub/epel/6/x86_64/$epel_rpm
if [ $? != 0 ]; then
echo "***ERROR: Can't download EPEL rpm $epel_rpm"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index c807752..34b1b62 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -86,13 +86,9 @@ export EPEL_RPM=""
# full path of the Trafodion package tar file
export TRAF_PACKAGE=""
-# if TRAF_PACKAGE wasn't specified then these two values must be specified
-# TRAF_BUILD is the trafodion_server tar file
-# DCS_BUILD is the DCS tar file
-# REST_BUILD is the REST tar file
-export TRAF_BUILD=""
-export DCS_BUILD=""
-export REST_BUILD=""
+#Default value set to "Y" if using a build BEFORE 05/11/2016 set this to "N"
+export ONE_TAR_INSTALL="Y"
+
# Either "cloudera" or "hortonworks" (all lowercase)
export HADOOP_TYPE=""
@@ -118,13 +114,11 @@ export HBASE_GROUP="hbase"
export HBASE="hbase"
# full path of where to install Trafodion to
-# Example is used below. If $HOME_DIR or $TRAF_USER have been changed
-# then this will need to be changed.
# On an upgrade, it is recommend to choose a different directory.
# First time install : /home/trafodion/traf
# On Upgrade: /home/trafodion/traf_<date>
# By doing this the previous version will remain and allow for an easier rollback.
-export SQ_ROOT="home/trafodion/traf"
+export SQ_ROOT=""
# Start Trafodion after install completes
export START="N"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10adf4b5/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 2c30af3..3e4eced 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -152,9 +152,9 @@ do
done
-HBASE=$(curl -k -su $ADMIN:$PASSWORD $URL/api/v1/clusters/$CLUSTER_NAME/services | grep name | grep hbase | sed -e 's@[,]@@'g | awk '{print $3}' | sed "s/\"//g")
-HDFS=$(curl -k -su $ADMIN:$PASSWORD $URL/api/v1/clusters/$CLUSTER_NAME/services | grep name | grep hdfs | sed -e 's@[,]@@'g | awk '{print $3}' | sed "s/\"//g")
-ZOOKEEPER=$(curl -k -su $ADMIN:$PASSWORD $URL/api/v1/clusters/$CLUSTER_NAME/services | grep name | grep zookeeper | sed -e 's@[,]@@'g | awk '{print $3}' | sed "s/\"//g")
+HBASE=$(curl -k -su $ADMIN:$PASSWORD $URL/api/v1/clusters/$CLUSTER_NAME/services | grep \"name\" | grep hbase | sed -e 's@[,]@@'g | awk '{print $3}' | sed "s/\"//g")
+HDFS=$(curl -k -su $ADMIN:$PASSWORD $URL/api/v1/clusters/$CLUSTER_NAME/services | grep \"name\" | grep hdfs | sed -e 's@[,]@@'g | awk '{print $3}' | sed "s/\"//g")
+ZOOKEEPER=$(curl -k -su $ADMIN:$PASSWORD $URL/api/v1/clusters/$CLUSTER_NAME/services | grep \"name\" | grep zookeeper | sed -e 's@[,]@@'g | awk '{print $3}' | sed "s/\"//g")
sudo chmod 777 $TRAF_CONFIG
sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
@@ -170,13 +170,6 @@ echo "export CDH_VERSION=\"$CDH_VERSION\"" >> $TRAF_CONFIG
sudo chmod 777 $TRAF_CONFIG
sudo rm -rf hbaseVersion.txt
-trafodionFullName=$(basename $TRAF_BUILD)
-echo "***DEBUG: trafodionFullName=$trafodionFullName"
-#Debug version
-trafodionVersion=$(echo $trafodionFullName | sed 's/trafodion_.*server-//' | sed 's/-debug//' | sed 's/.tgz//')
-
-echo "***INFO: Trafodion version = $trafodionVersion"
-
}
#==============================================
@@ -417,57 +410,28 @@ if [[ $CONFIG_COMPLETE ]]; then
fi
#==============================================
-#Run Trafodion scanner
-
-if [[ $UPGRADE_TRAF == "true" ]]; then
- echo
-else
- if [[ "$RUN_SCANNER" == "Y" ]]; then
- echo "***INFO: Running Trafodion Scanner"
- $LOCAL_WORKDIR/tools/trafodion_scanner -l $SCANNER_LOG -t $TRAF_CONFIG \
- -c $LOCAL_WORKDIR/tools/trafodion_scanner.cfg | tee -a $INSTALL_LOG
-
- returnCode=${PIPESTATUS[0]}
-
- case $returnCode in
-
- 2|1)
- echo "***ERROR: Error while running trafodion_scanner."
- echo "***ERROR: Please review logs and fix listed issue(s)."
- exit -1
- ;;
- 3|0)
- echo "***INFO: Trafodion scanner ran without error. Install will continue..."
- ;;
- *)
- echo "***ERROR: Error while running trafodion_scanner."
- exit -1
- ;;
- esac
- fi
-fi
-
-#=============================================
sed -i '/ACCEPT_LICENSE\=/d' $TRAF_CONFIG
echo "export ACCEPT_LICENSE=\"$ACCEPT_LICENSE\"" >> $TRAF_CONFIG
#==============================================
# untar package and files into /usr/lib/trafodion (the new TRAF_WORKDIR)
-# This will be a global location that all tar files are untarred into
-# if we have the package tar file we need to extract
+# if we have the package tar of tar files we need to extract
# trafodion core and dcs and rest-server builds from it
-if [ ! -z $TRAF_PACKAGE ]; then
+# if not then we need to copy to $TRAF_WORKDIR
+
- # create directory to contain build tar files using the
- # timestamp from the package filename
- traf_filename=$(basename "$TRAF_PACKAGE")
- UNTAR_DIR="$TRAF_WORKDIR/${traf_filename%.tar.gz}"
- sudo mkdir -p $UNTAR_DIR
- sudo chmod 755 $UNTAR_DIR
+# create directory to contain build tar files using the
+# timestamp from the package filename
- # untar the package
+traf_filename=$(basename "$TRAF_PACKAGE")
+UNTAR_DIR="$TRAF_WORKDIR/${traf_filename%.tar.gz}"
+sudo mkdir -p $UNTAR_DIR
+sudo chmod 755 $UNTAR_DIR
+
+if [[ "$ONE_TAR_INSTALL" == "N" ]]; then
+
sudo tar -xzf $TRAF_PACKAGE --directory=$UNTAR_DIR
build_file=$(ls $UNTAR_DIR | grep "trafodion_.*server")
@@ -487,53 +451,38 @@ if [ ! -z $TRAF_PACKAGE ]; then
REST_BUILD=$UNTAR_DIR/$build_file
fi
-else
- # we don't have a package and only have the trafodion and dcs build tar files
- # we can't use the package filename timestamp since we don't have a package tar
- # file so we'll just create a directory using the current time
- UNTAR_DIR="$TRAF_WORKDIR/traf_$(date +%F_%H%M)"
- sudo mkdir -p $UNTAR_DIR
- sudo chmod 777 $UNTAR_DIR
-
- sudo cp $TRAF_BUILD $UNTAR_DIR
- if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy trafodion build ($TRAF_BUILD) to $UNTAR_DIR"
- exit -1
- fi
+ sed -i '/TRAF_BUILD\=/d' $TRAF_CONFIG
+ echo "export TRAF_BUILD=\"$TRAF_BUILD\"" >> $TRAF_CONFIG
+ sed -i '/DCS_BUILD\=/d' $TRAF_CONFIG
+ echo "export DCS_BUILD=\"$DCS_BUILD\"" >> $TRAF_CONFIG
+ sed -i '/REST_BUILD\=/d' $TRAF_CONFIG
+ echo "export REST_BUILD=\"$REST_BUILD\"" >> $TRAF_CONFIG
- sudo cp $DCS_BUILD $UNTAR_DIR
+else
+ sudo cp $TRAF_PACKAGE $UNTAR_DIR
if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy DCS build ($DCS_BUILD) to $UNTAR_DIR"
+ echo "***ERROR: unable to copy trafodion package ($TRAF_PACKAGE) to $UNTAR_DIR"
exit -1
fi
+
+fi
- if [ ! -z $REST_BUILD ]; then
- sudo cp $REST_BUILD $UNTAR_DIR
- if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy REST build ($REST_BUILD) to $UNTAR_DIR"
- exit -1
- fi
- fi
-
- build_file=$(basename $TRAF_BUILD)
- TRAF_BUILD=$UNTAR_DIR/$build_file
-
- sudo tar -xzf $TRAF_BUILD --directory=$UNTAR_DIR
-
- build_file=$(basename $DCS_BUILD)
- DCS_BUILD=$UNTAR_DIR/$build_file
+cd $UNTAR_DIR
- build_file=$(basename $REST_BUILD)
- REST_BUILD=$UNTAR_DIR/$build_file
+# clean up any old files left lying around
+sudo rm -rf $UNTAR_DIR/export/lib 2>/dev/null
+# extract the hbase-trx jar file (and others) from the tar file
+if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
+ sudo tar -xzf $TRAF_PACKAGE export/lib 2>&1 | tee -a $INSTALL_LOG
+else
+ sudo tar -xzf $TRAF_BUILD export/lib 2>&1 | tee -a $INSTALL_LOG
+fi
+if [ ${PIPESTATUS[0]} != 0 ]; then
+ echo "***ERROR: unable to find export/lib/ directory in $TRAF_BUILD" 2>&1 | tee -a $INSTALL_LOG
+ exit -1
fi
-sed -i '/TRAF_BUILD\=/d' $TRAF_CONFIG
-echo "export TRAF_BUILD=\"$TRAF_BUILD\"" >> $TRAF_CONFIG
-sed -i '/DCS_BUILD\=/d' $TRAF_CONFIG
-echo "export DCS_BUILD=\"$DCS_BUILD\"" >> $TRAF_CONFIG
-sed -i '/REST_BUILD\=/d' $TRAF_CONFIG
-echo "export REST_BUILD=\"$REST_BUILD\"" >> $TRAF_CONFIG
# add the untar directory to the config file
sed -i '/UNTAR_DIR\=/d' $TRAF_CONFIG
@@ -547,23 +496,6 @@ if [[ $HADOOP_TYPE != "apache" ]]; then
checkHBaseVersion
fi
#==============================================
-# Determine Trafodion version by parsing it
-# from the trafodion_server tar file.
-# Determine Java version
-
-cd $UNTAR_DIR
-
-# clean up any old files left lying around
-sudo rm -rf $UNTAR_DIR/export/lib 2>/dev/null
-
-# extract the hbase-trx jar file (and others) from the build tar file
-sudo tar -xzf $TRAF_BUILD export/lib 2>&1 | tee -a $INSTALL_LOG
-if [ ${PIPESTATUS[0]} != 0 ]; then
- echo "***ERROR: unable to find export/lib/ directory in $TRAF_BUILD" 2>&1 | tee -a $INSTALL_LOG
- exit -1
-fi
-
-#==============================================
# Run trafodion_setup
echo
echo "******************************"
@@ -821,4 +753,8 @@ source $TRAF_CONFIG
copyConfig
removePassword
echo
+echo "******************************"
+echo " TRAFODION INSTALLATION END"
+echo "******************************"
echo
+
[08/39] incubator-trafodion git commit: Merge Fix for
[TRAFODION-1923] PR-463
Posted by db...@apache.org.
Merge Fix for [TRAFODION-1923] PR-463
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/af674971
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/af674971
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/af674971
Branch: refs/heads/master
Commit: af67497157cc5fa0123b63ec499a79640cc4d0f7
Parents: 29fb212 ac298d3
Author: selvaganesang <se...@apache.org>
Authored: Wed May 4 14:38:26 2016 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Wed May 4 14:38:26 2016 +0000
----------------------------------------------------------------------
.../TransactionalScanner.java.tmpl | 6 ++-
.../transactional/SplitBalanceHelper.java | 51 ++++++++++++++++++--
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/tools/runregr_executor.ksh | 2 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
6 files changed, 59 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[32/39] incubator-trafodion git commit: Merge error for JAVA check!
Posted by db...@apache.org.
Merge error for JAVA check!
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0205fcef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0205fcef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0205fcef
Branch: refs/heads/master
Commit: 0205fcef88c30a6a42bdc4dd2cb3f040b2ab17f6
Parents: 15fbc0b
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 21:37:02 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 21:37:02 2016 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0205fcef/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 7a63180..49637c3 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -414,7 +414,13 @@ else
#Checking if using 1.7.0_n
if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
- error="true"
+ #If Java is **less** than than 1.7.0_65 the next command will fail.
+ #Install will fail anyways if less than 1.7.0_65
+ #Will not fail if Java is 1.7.0_100 or greater
+ #Temporary fix to support Java 7 upgrades greater than 100
+ if [[ "${THIS_JVM_VER:20:3}" -lt $JAVA_65 ]]; then
+ error="true"
+ fi
fi
fi
[13/39] incubator-trafodion git commit: [[TRAFODION-1951]] Fix for
JAVA checking
Posted by db...@apache.org.
[[TRAFODION-1951]] Fix for JAVA checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e208598d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e208598d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e208598d
Branch: refs/heads/master
Commit: e208598d88caab04e14db1dbb38ac5f4378e8826
Parents: b3f7856
Author: Amanda Moran <am...@apache.com>
Authored: Thu May 5 17:11:48 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu May 5 17:11:48 2016 +0000
----------------------------------------------------------------------
.../installer/traf_apache_hadoop_config_setup | 842 -------------------
install/installer/traf_config_check | 8 +-
.../installer/trafodion_apache_hadoop_install | 763 -----------------
3 files changed, 7 insertions(+), 1606 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e208598d/install/installer/traf_apache_hadoop_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_apache_hadoop_config_setup b/install/installer/traf_apache_hadoop_config_setup
deleted file mode 100755
index 9547db2..0000000
--- a/install/installer/traf_apache_hadoop_config_setup
+++ /dev/null
@@ -1,842 +0,0 @@
-#!/bin/bash
-
-# @@@ START COPYRIGHT @@@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# @@@ END COPYRIGHT @@@
-
-# Script that prompts user for all user input needed for the
-# trafodion_config file
-
-
-#==============================================
-# Defaults
-suseLinux=$(grep -cr SUSE /proc/version)
-LOCAL_WORKDIR="$( cd "$( dirname "$0" )" && pwd )"
-TRAF_WORKDIR="/usr/lib/trafodion"
-TRAF_CONFIG="/etc/trafodion/trafodion_config"
-TRAF_CONFIG_DIR=$(dirname $TRAF_CONFIG)
-LOCAL_TRAF_CONFIG="$LOCAL_WORKDIR/trafodion_config"
-LDAP_AUTH_FILE="traf_authentication_config_${HOSTNAME}"
-TRAF_USER="trafodion"
-TRAF_USER_PASSWORD="traf123" # must be 6-8 chars
-userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l`
-NODE_LIST=""
-HOME_DIR="/home"
-
-TRAF_PACKAGE=""
-TRAF_BUILD=""
-DCS_BUILD=""
-
-
-HADOOP_PREFIX=""
-HBASE_HOME=""
-HIVE_HOME=""
-
-
-HADOOP_NODES=""
-HDFS_USER="hdfs"
-HBASE_USER="hbase"
-HBASE_GROUP="hbase"
-
-SQ_ROOT=""
-INIT_TRAFODION="N"
-START="N"
-SQCONFIG=""
-DCS_SERVERS_PARM="2"
-LDAP_SECURITY="N"
-SCANNER_MODE="N"
-
-LDAP_LEVEL="0"
-#==============================================
-
-function print_usage {
-cat << EOF
-
-This script takes in user input to add to the trafodion_config file or uses known
-defaults. Script will return an error if user enters bad inputs. Type response or
-select [Enter] to select default.
-
-Inputs Requested:
-
-*Trafodion Password (default is [$TRAF_USER_PASSWORD])
-*List of Nodes
-*Home directory (default is [$HOME_DIR])
-*Location of EPEL RPM (default is [None])
-*Full path to Trafodion Server tar file
-(default is [$TRAF_BUILD])
-*Apache Hadoop install location
-*Apache Hbase install location
-*Apache Hive install location
-*HDFS username (default is [$HDFS_USER])
-*HBase username (default is [$HBASE_USER])
-*HBase group (default is [$HBASE_GROUP])
-*Full pathname to the install directory location (default [$SQ_ROOT])
-*Full pathname to the DNS build tar file (default [$DCS_BUILD])
-*Start Trafodion after install (default is [No])
-*Total number of DCS servers to start
-
-
-Options:
- --help Print this message and exit.
-
-EOF
-}
-
-#==============================================
-#Parse input parameters
-
-while [[ $# -gt 0 ]]; do
- case "$1" in
- --scanner_mode)
- SCANNER_MODE="Y"
- ;;
-
- --help)
- print_usage
- exit -1
- ;;
- *)
- echo "***ERROR: unknown parameter '$1'"
- print_usage
- exit -1
- esac
- shift
-done
-
-#==============================================
-
-
-echo
-echo "*******************************"
-echo " Trafodion Configuration Setup"
-echo "*******************************"
-echo
-echo "***INFO: Please press [Enter] to select defaults."
-echo
-
-sudo mkdir -p $TRAF_WORKDIR
-sudo chmod 777 $TRAF_WORKDIR
-
-# if there was a partial config file then use it
-# to fill in default values so user doesn't have to retype
-# everything again.
-if [ -f $LOCAL_TRAF_CONFIG ]; then
- source $LOCAL_TRAF_CONFIG
-fi
-
-if [[ "$suseLinux" -ge "1" ]]; then
- SUSE_LINUX="true"
-else
- SUSE_LINUX="false"
-fi
-
-echo "#!/bin/bash" > $LOCAL_TRAF_CONFIG
-echo "export SUSE_LINUX=\"$SUSE_LINUX\"" >> $LOCAL_TRAF_CONFIG
-echo "export TRAF_USER=\"$TRAF_USER\"" >> $LOCAL_TRAF_CONFIG
-echo "export TRAF_WORKDIR=\"$TRAF_WORKDIR\"" >> $LOCAL_TRAF_CONFIG
-echo "export LOCAL_WORKDIR=\"$LOCAL_WORKDIR\"" >> $LOCAL_TRAF_CONFIG
-echo "export SQCONFIG=\"$SQCONFIG\"" >> $LOCAL_TRAF_CONFIG
-
-#==============================================
-# Password
-if [[ "$userForTrafodion" == "0" ]]; then
- echo -n "Enter $TRAF_USER password, default is [$TRAF_USER_PASSWORD]: "
- read answer
- if [ -z $answer ]; then
- echo "export TRAF_USER_PASSWORD=\"$TRAF_USER_PASSWORD\"" >> $LOCAL_TRAF_CONFIG
- else
- length=${#answer}
- if [[ $length -lt "6" ]]; then
- echo "***ERROR: Linux requires password to be at least 6 characters"
- echo "***ERROR: Password length must be from 6-8 characters."
- exit -1
- fi
- if [[ $length -gt "8" ]]; then
- echo "***ERROR: VNC server requires passwords be 8 or less characters"
- echo "***ERROR: Password length must be from 6-8 characters."
- exit -1
- fi
- echo "export TRAF_USER_PASSWORD=\"$answer\"" >> $LOCAL_TRAF_CONFIG
- fi
-fi
-
-#==============================================
-# List of Nodes
-
-echo -n "Enter list of nodes to install trafodion(must have apache hadoop/hbase installed) (blank separated), default [$NODE_LIST]: "
-read answer
-if [[ -z "$answer" ]]; then
- if [ -z "$NODE_LIST" ]; then
- echo "***ERROR: Must enter list of nodes."
- exit -1
- fi
-else
- NODES="$answer"
- NODE_LIST=""
- ERROR_NODES=""
- for node in $NODES
- do
- newNode=$(ssh -q -n $node hostname)
-
- if [[ $? -ne "0" ]]; then
- echo "***ERROR: Could not ssh to $node."
- echo "***ERROR: Please check node names for typos"
- exit -1
- fi
-
- nodeName=$(echo $newNode | sed 's/[^a-zA-Z0-9\ \.\-]//g')
-
- if [[ "$nodeName" != "$newNode" ]]; then
- echo "***ERROR: Nodes are not named properly."
- echo "***ERROR: Nodes can have no special characters other than '-' and '.'"
- exit -1
- fi
-
- if [[ "$newNode" =~ ^([0-9]{1,3})[.]([0-9]{1,3})[.]([0-9]{1,3})[.]([0-9]{1,3})$ ]]; then
- echo "***ERROR: Nodes are not named properly."
- echo "***ERROR: IP addresses are not supported. Please use node names."
- exit -1
- fi
-
- #Testing sudo access on all nodes
- ssh -q -n $newNode sudo echo "***INFO: Testing sudo access on node $newNode"
- if [ $? -ne "0" ]; then
- error=1
- ERROR_NODES="$ERROR_NODES $newNode"
- fi
- NODE_LIST="$NODE_LIST $newNode"
- done
-
- if [[ $error == "1" ]]; then
- echo "***ERROR: $ERROR_NODES does not have sudo access."
- echo "***ERROR: Must have sudo access on all nodes."
- exit -1
- fi
-
-fi
-
-for node in $NODE_LIST
-do
- ssh -q -n $node echo "***INFO: Testing ssh on $node"
- if [[ $? -ne "0" ]]; then
- errorFound=1
- ERROR_NODES="$ERROR_NODES $node"
- fi
-done
-
-if [[ $errorFound == "1" ]]; then
- echo "***ERROR: Could not ssh to $ERROR_NODES."
- echo "***ERROR: Check permissions and known hosts files."
- exit -1
-fi
-
-node_count=$(echo $NODE_LIST | wc -w)
-echo "export NODE_LIST=\"$NODE_LIST\"" >> $LOCAL_TRAF_CONFIG
-echo "export node_count=\"$node_count\"" >> $LOCAL_TRAF_CONFIG
-
-MY_NODES=""
-for node in $NODE_LIST
-do
- MY_NODES="$MY_NODES -w $node"
-done
-echo "export MY_NODES=\"$MY_NODES\"" >> $LOCAL_TRAF_CONFIG
-
-if [ $node_count -eq 1 ]; then
- TRAF_PDSH=""
-else
- TRAF_PDSH="pdsh -S $MY_NODES"
-fi
-
-#==============================================
-# Home directory
-if [[ "$userForTrafodion" == "0" ]]; then
- echo -n "Enter Trafodion userid's home directory prefix, default is [$HOME_DIR]: "
- read answer
-
- if [ ! -z $answer ]; then
- # strip off TRAF_USER if user added it on end of directory
- HOME_DIR=$(echo "$answer" | sed -e "s@/$TRAF_USER\$@@")
- fi
-
- #Test if home directory is on a NFS disk
- diskType="$( df -P -T $HOME_DIR | tail -n +2 | awk '{print $2}')"
- if [ "$diskType" == "nfs" ]; then
- echo "***ERROR: Trafodion userid's home directory ($HOME_DIR) cannot be on an NFS disk"
- echo "***ERROR: Please choose a different directory to install on."
- exit -1
- fi
-else
- HOME_DIR=$(grep -r "trafodion" /etc/passwd | sed 's/.*:://' | sed 's/\:.*$//' | sed 's/\/trafodion.*$//')
-
-fi
-
-echo "export HOME_DIR=\"$HOME_DIR\"" >> $LOCAL_TRAF_CONFIG
-#==============================================
-#Check location given for EPEL RPM
-if [[ "$userForTrafodion" == "0" ]] &&[[ "$SUSE_LINUX" != "true" ]]; then
- echo -n "Specify full path to EPEL RPM (including .rpm), default is None: "
- read answer
-
- if [ -z $answer ]; then
- echo "***INFO: Will attempt to download RPM if EPEL is not installed on all nodes."
- echo "export EPEL_RPM=\"\"" >> $LOCAL_TRAF_CONFIG
- else
- if [[ ! -f $answer ]]; then
- echo "***ERROR: File not found. Please check path for existence and typos."
- exit -1
- fi
- if [[ "$answer" == *"rpm"* ]]; then
- echo "export EPEL_RPM=\"$answer\"" >> $LOCAL_TRAF_CONFIG
- else
- echo "***ERROR: File enter is not an RPM. Check file is of type epel***.rpm"
- exit -1
- fi
- fi
-fi
-#==============================================
-#Check location given for Java 65 or greater
-
-echo -n "Specify location of Java 1.7.0_65 or higher (JDK), default is [$JAVA_HOME]: "
-read answer
-
-if [ -z $answer ]; then
- if [ -z $JAVA_HOME ]; then
- echo "***ERROR: Must specify location of Java 1.7.0_65 or higher (JDK)."
- exit -1
- fi
-else
- JAVA_HOME=$answer
-fi
-
-REQ_VER="1.7.0_65"
-JAVA7="7"
-JAVA65="65"
-
-for node in $NODE_LIST
-do
- THIS_JVM_VER="$(ssh -q -n $node $JAVA_HOME/bin/java -version 2>&1 > /dev/null)"
- if [[ "$THIS_JVM_VER" == *"No such file"* ]]; then
- echo "***ERROR: Unable to find Java version on node $node"
- echo "***ERROR: Must enter a specific Java version (example: /usr/java/jdk1.7.0_67)"
- echo "***ERROR: Please check for typos and that directory exists"
- exit -1
- fi
-
- javaType="$(ssh -q -n $node $JAVA_HOME/bin/javac -version 2>&1 > /dev/null | grep "No such file" | wc -l)"
- if [[ $javaType -eq "1" ]]; then
- echo "***ERROR: Java version on node $node is of type JRE"
- echo "***ERROR: Java version needed on all nodes must be a JDK"
- exit -1
- fi
-
- temp_JAVA=`echo "${THIS_JVM_VER:15:2}" | sed 's/.*\.//'`
-
- #Check if using something less than Java 7
- if [[ "$temp_JAVA" -lt "$JAVA7" ]]; then
- error="true"
- fi
-
- #Checking if using 1.7.0_n
- if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
- if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
- error="true"
- fi
- fi
-
- if [[ -n $error ]]; then
- echo "***ERROR: Your existing JAVA_HOME on $node is less than $REQ_VER"
- echo "***ERROR: Your Java Version on $node = $THIS_JVM_VER"
- echo "***ERROR: Required java version on $node should be greater than $REQ_VER"
- exit -1
- fi
-done
-
-echo "export JAVA_HOME=\"$JAVA_HOME\"" >> $LOCAL_TRAF_CONFIG
-
-#==============================================
-# Trafodion Build location
-# set the following based on what the user provided as input
-# TRAF_PACKAGE = the trafodion package tar file which contains trafodion core & dcs
-# TRAF_BUILD = the trafodion core tar file extracted from the trafodion package
-# DCS_BUILD = the dcs tar file extracted from the trafodion package
-
-if [ -z "$TRAF_PACKAGE" ]; then
- TRAF_DEFAULT="$TRAF_BUILD"
-else
- TRAF_DEFAULT="$TRAF_PACKAGE"
-fi
-
-
-echo -n "Enter full path (including .tar or .tar.gz) of trafodion tar file [$TRAF_DEFAULT]: "
-read answer
-if [ -z $answer ] && [ -z $TRAF_DEFAULT ]; then
- echo "***ERROR: Must specify Trafodion tar file location."
- exit -1
-fi
-
-if [ ! -z "$answer" ]; then
- TRAF_PACKAGE="$answer"
-else
- TRAF_PACKAGE="$TRAF_DEFAULT"
-fi
-
-# make sure file exists
-if [ ! -f $TRAF_PACKAGE ]; then
- echo "***ERROR: $TRAF_PACKAGE does not exist"
- exit -1
-fi
-
-# Determine if we have a package or just the trafodion_server tar file
-# Normally, the package file is what should be specified but because
-# we used to not support the package file and required the trafodion core
-# tar file previous users might still specify the trafodion core tar file instead
-# Also, developers might only have trafodion core tar file and not a package
-# tar file.
-package=$(tar -tzf $TRAF_PACKAGE | grep build-version.txt | wc -l )
-if [ $package -eq 0 ]; then
-
- # assume user specified a trafodion core tar file
- TRAF_BUILD=$TRAF_PACKAGE
- TRAF_PACKAGE=""
-
- #TODO: do a quick sanity check on the file to make sure it is a traf build tar file
-
- echo "***INFO: tar file is not a package tar file which includes Trafodion & DCS"
- echo "***INFO: assuming it is a Trafodion build only tar file"
-
- # since it is not a package tar file, we'll need to prompt for the DCS build file
- echo -n "Enter location of DCS tar file [DCS_BUILD]: "
- read answer
- if [ -z $answer ]; then
- if [ -z $DCS_BUILD ]; then
- echo "***ERROR: Must specify DCS tar file location."
- exit -1
- fi
- else
- DCS_BUILD=$answer
- fi
-
- # make sure file exists
- if [ ! -f $DCS_BUILD ]; then
- echo "***ERROR: $DCS_BUILD does not exist"
- exit -1
- fi
-
- #TODO: do a quick sanity check on the file to make sure it is a DCS build tar file
-
- # since it is not a package tar file, we'll need to prompt for the rest build file
- echo -n "Enter location of REST tar file [$REST_BUILD]: "
- read answer
- if [ -z $answer ]; then
- if [ -z $REST_BUILD ]; then
- echo "***ERROR: Must specify REST tar file location."
- exit -1
- fi
- else
- REST_BUILD=$answer
- fi
-
- # make sure file exists
- if [ ! -f $REST_BUILD ]; then
- echo "***ERROR: $REST_BUILD does not exist"
- exit -1
- fi
-
- #TODO: do a quick sanity check on the file to make sure it is a rest build tar file
-
-else
- # user specifed a package file
- TRAF_BUILD=""
- DCS_BUILD=""
- REST_BUILD=""
-fi
-
-
-echo "export TRAF_PACKAGE=\"$TRAF_PACKAGE\"" >> $LOCAL_TRAF_CONFIG
-echo "export TRAF_BUILD=\"$TRAF_BUILD\"" >> $LOCAL_TRAF_CONFIG
-echo "export DCS_BUILD=\"$DCS_BUILD\"" >> $LOCAL_TRAF_CONFIG
-echo "export REST_BUILD=\"$REST_BUILD\"" >> $LOCAL_TRAF_CONFIG
-
-#Check if install_features file exists
-if [[ -z $TRAF_BUILD ]]; then
- TRAF_BUILD=$(tar -tf $TRAF_PACKAGE | grep "trafodion_server")
- tar -xzf $TRAF_PACKAGE --directory $LOCAL_WORKDIR
-fi
-
-if [[ -z $TRAF_BUILD ]]; then
- echo "***ERROR: trafodion_server-n.n.n.tgz not included in $TRAF_PACKAGE"
- echo "***ERROR: Workaround may be to enter trafodion_server-n.n.n.tgz as trafodion tar package."
- exit -1
-fi
-
-
-#==============================================
-#Hadoop path
-
-echo -n "Enter Hadoop installed full path, default is [$HADOOP_PREFIX]: "
-read answer
-
-if [ -z $answer ]; then
- if [[ -z $HADOOP_PREFIX ]]; then
- echo "***ERROR: Must enter apache Hadoop installed path"
- exit -1
- fi
-else
- if [[ -e $answer ]]; then
- HADOOP_PREFIX=$answer
- else
- echo "***ERROR: apache Hadoop installed path doesn't exist"
- exit -1
- fi
-fi
-echo "export HADOOP_PREFIX=\"$HADOOP_PREFIX\"" >> $LOCAL_TRAF_CONFIG
-
-#==============================================
-#Hbase path
-
-echo -n "Enter Hbase installed full path, default is [$HBASE_HOME]: "
-read answer
-
-if [ -z $answer ]; then
- if [[ -z $HBASE_HOME ]]; then
- echo "***ERROR: Must enter apache Hbase installed path"
- exit -1
- fi
-else
- if [[ -e $answer ]]; then
- HBASE_HOME=$answer
- else
- echo "***ERROR: apache Hbase installed path doesn't exist"
- exit -1
- fi
-fi
-echo "export HBASE_HOME=\"$HBASE_HOME\"" >> $LOCAL_TRAF_CONFIG
-
-#==============================================
-#Hive path
-
-echo -n "Enter Hive installed full path, default is [$HIVE_HOME]: "
-read answer
-
-if [ -z $answer ]; then
- if [[ -z $HIVE_HOME ]]; then
- echo "***ERROR: Must enter apache Hive installed path"
- exit -1
- fi
-else
- if [[ -e $answer ]]; then
- HIVE_HOME=$answer
- else
- echo "***ERROR: apache Hive installed path doesn't exist"
- exit -1
- fi
-fi
-
-echo "export HIVE_HOME=\"$HIVE_HOME\"" >> $LOCAL_TRAF_CONFIG
-
-#=====================
-#Hadoop checks
-count=0
-
-# assume they are the same
-HADOOP_NODES=$NODE_LIST
-echo "export HADOOP_NODES=\"$HADOOP_NODES\"" >> $LOCAL_TRAF_CONFIG
-
-for node in $NODE_LIST;
-do
- ssh -q -n $node 'echo "exit" | hbase shell &> $HOME/hbaseVersion.txt'
- count=$[$count+1]
- foundFile=$(ssh -q -n $node ls $HOME/hbaseVersion.txt | wc -l)
- if [[ $foundFile -eq "0" ]]; then
- echo "***ERROR: HBase shell not found on any node"
- echo "***ERROR: Check that HBase is installed and working"
- exit -1
- fi
-done
-
-
-#==============================================
-#HDFS Username
-
-echo -n "Enter HDFS username, default is [$HDFS_USER]: "
-read answer
-
-if [ -z $answer ]; then
- echo "export HDFS_USER=\"$HDFS_USER\"" >> $LOCAL_TRAF_CONFIG
-else
- echo "export HDFS_USER=\"$answer\"" >> $LOCAL_TRAF_CONFIG
-fi
-
-#==============================================
-#HBase user
-
-echo -n "Enter HBase username, default is [$HBASE_USER]: "
-read answer
-
-if [ -z $answer ]; then
- echo "export HBASE_USER=\"$HBASE_USER\"" >> $LOCAL_TRAF_CONFIG
-else
- echo "export HBASE_USER=\"$answer\"" >> $LOCAL_TRAF_CONFIG
-fi
-
-#==============================================
-#HBase group
-
-echo -n "Enter HBase group, default is [$HBASE_GROUP]: "
-read answer
-
-if [ -z $answer ]; then
- echo "export HBASE_GROUP=\"$HBASE_GROUP\"" >> $LOCAL_TRAF_CONFIG
-else
- echo "export HBASE_GROUP=\"$answer\"" >> $LOCAL_TRAF_CONFIG
-fi
-
-#==============================================
-#Install location
-
-if [ -z $SQ_ROOT ]; then
-
- # if we have a package file then use its name for the default install dir
- if [ ! -z "$TRAF_PACKAGE" ]; then
- traf_filename=$(basename "$TRAF_PACKAGE")
- SQ_ROOT="$HOME_DIR/$TRAF_USER/${traf_filename%.tar.gz}"
- else
- # otherwise, create a default install dir using a timestamp
- SQ_ROOT="$HOME_DIR/$TRAF_USER/traf_$(date +%F_%H%M)"
- fi
-fi
-
-echo -n "Enter directory to install trafodion to, default is [$SQ_ROOT]: "
-read answer
-
-if [ -z $answer ]; then
- echo "export SQ_ROOT=\"$SQ_ROOT\"" >> $LOCAL_TRAF_CONFIG
-else
- echo "export SQ_ROOT=\"$answer\"" >> $LOCAL_TRAF_CONFIG
-fi
-
-#==============================================
-#Run sqstart
-if [[ $SCANNER_MODE == "N" ]]; then
- echo -n "Start Trafodion after install (Y/N), default is Y: "
- read answer
-
- if [ -z $answer ]; then
- echo "export START=\"Y\"" >> $LOCAL_TRAF_CONFIG
- echo "export INIT_TRAFODION=\"Y\"" >> $LOCAL_TRAF_CONFIG
- else
- if [[ "${answer}" =~ ^[Yy]$ ]]; then
- echo "export START=\"Y\"" >> $LOCAL_TRAF_CONFIG
- echo "export INIT_TRAFODION=\"Y\"" >> $LOCAL_TRAF_CONFIG
- else
- echo "export START=\"N\"" >> $LOCAL_TRAF_CONFIG
- echo "export INIT_TRAFODION=\"N\"" >> $LOCAL_TRAF_CONFIG
- echo "***INFO: Trafodion will not be started after install is complete."
- echo "***INFO: User will need follow steps on the trafodion wiki on how to start."
- fi
- fi
-fi
-#==============================================
-#DCS Servers
-
-echo -n "Total number of DCS servers to start, default [$DCS_SERVERS_PARM]: "
-read answer
-
-if [ ! -z $answer ]; then
- DCS_SERVERS_PARM="$answer"
-fi
-
-if [[ $DCS_SERVERS_PARM != *[!0-9]* ]]; then
- echo "export DCS_SERVERS_PARM=\"$DCS_SERVERS_PARM\"" >> $LOCAL_TRAF_CONFIG
-else
- echo "***ERROR: DCS servers must be a number."
- exit -1
-fi
-
-#==============================================
-#Simple security
-if [[ $SCANNER_MODE == "N" ]]; then
- echo -n "Enable simple LDAP security (Y/N), default is N: "
- read answer
-
- if [ ! -z $answer ]; then
- if [[ "${answer}" =~ ^[Yy]$ ]]; then
- LDAP_SECURITY="Y"
- fi
- else
- LDAP_SECURITY="N"
- fi
-
- echo "export LDAP_SECURITY=\"$LDAP_SECURITY\"" >> $LOCAL_TRAF_CONFIG
-
- if [[ "$LDAP_SECURITY" == "Y" ]]; then
- #Hostnames
- echo -n "Enter list of LDAP Hostnames (blank separated), default [$LDAP_HOSTS]: "
- read answer1
- if [[ -z "$answer1" ]]; then
- if [ -z "$LDAP_HOSTS" ]; then
- echo "***ERROR: Must enter list of LDAP Hostnames."
- exit -1
- fi
- else
- LDAP_HOSTS=$answer1
- fi
- echo "export LDAP_HOSTS=\"$LDAP_HOSTS\"" >> $LOCAL_TRAF_CONFIG
- cp -rf traf_authentication_conf_default $LOCAL_WORKDIR/$LDAP_AUTH_FILE
- echo "export LDAP_AUTH_FILE=\"$LDAP_AUTH_FILE\"" >> $LOCAL_TRAF_CONFIG
-
- counter=0
- for host in $LDAP_HOSTS
- do
- counter=$[$counter+1]
- if [ $counter -eq "1" ]; then
- list=" LdapHostname: $host"
- elif [ $counter -eq "$node_count" ]; then
- list="LdapHostname: $host\n $list"
- else
- list=" LdapHostname: $host\n $list"
- fi
- done
- sed -i -e "s/LdapHostname:/$list/g" $LDAP_AUTH_FILE
-
- #Port numbers
- echo -n "Enter LDAP Port number (Example: 389 for no encryption or TLS, 636 for SSL), default [$LDAP_PORT]: "
- read answer2
- if [[ -z "$answer2" ]]; then
- if [ -z "$LDAP_PORT" ]; then
- echo "***ERROR: Must enter LDAP port."
- exit -1
- fi
- else
- LDAP_PORT=$answer2
- fi
-
- echo "export LDAP_PORT=\"$LDAP_PORT\"" >> $LOCAL_TRAF_CONFIG
- port="LdapPort: $LDAP_PORT"
- sed -i -e "s/LdapPort:389/$port/g" $LDAP_AUTH_FILE
-
- #Unique IDs
- echo -n "Enter all LDAP unique identifiers (blank separated), default [$LDAP_ID]: "
- read answer3
- if [[ -z "$answer3" ]]; then
- if [ -z "$LDAP_ID" ]; then
- echo "***ERROR: Must enter LDAP unique identifiers."
- exit -1
- fi
- else
- LDAP_ID=$answer3
- fi
- echo "export LDAP_ID=\"$LDAP_ID\"" >> $LOCAL_TRAF_CONFIG
-
- counter=0
- for id in $LDAP_ID
- do
- counter=$[$counter+1]
- if [ $counter -eq "1" ]; then
- list=" UniqueIdentifier: $id"
- elif [ $counter -eq "$node_count" ]; then
- list="UniqueIdentifier: $id\n $list"
- else
- list=" LdapHostname: $id\n $list"
- fi
- done
-
- sed -i -e "s/UniqueIdentifier:/$list/g" $LDAP_AUTH_FILE
-
- #Encryption level
- echo -n "Enter LDAP Encryption Level (0: Encryption not used, 1: SSL, 2: TLS), default [$LDAP_LEVEL]: "
- read answer4
- if [[ -z "$answer4" ]]; then
- if [ -z "$LDAP_LEVEL" ]; then
- echo "***ERROR: Much enter LDAP Encryption level."
- exit -1
- fi
- else
- LDAP_LEVEL=$answer4
- fi
- echo "export LDAP_LEVEL=\"$LDAP_LEVEL\"" >> $LOCAL_TRAF_CONFIG
-
- level="LDAPSSL: $LDAP_LEVEL"
- sed -i -e "s/LDAPSSL:0/$level/g" $LDAP_AUTH_FILE
-
-
- if [[ "$LDAP_LEVEL" -eq "1" ]] || [[ "$LDAP_LEVEL" -eq "2" ]]; then
- echo -n "Enter full path to TLS certificate, default [$LDAP_CERT]: "
- read answer7
- if [[ -z "$answer7" ]]; then
- if [ -z "$LDAP_CERT" ]; then
- echo "***ERROR: Encryption level 2(TLS) requires a certificate file (*.pem)"
- exit -1
- fi
- else
- LDAP_CERT=$answer7
- LDAP_CERT_BASE=$(basename $LDAP_CERT)
-
- if [[ ! -f $LDAP_CERT ]]; then
- echo "***ERROR: File does not exist."
- echo "***ERROR: Please enter full path or check for errors."
- exit -1
- fi
-
- fi
- echo "export LDAP_CERT=\"$LDAP_CERT\"" >> $LOCAL_TRAF_CONFIG
- echo "export LDAP_CERT_BASE=\"$LDAP_CERT_BASE\"" >> $LOCAL_TRAF_CONFIG
-
- list="TLS_CACERTFilename: $HOME_DIR/$TRAF_USER/$LDAP_CERT_BASE"
-
- sed -i -e "s@TLS\_CACERTFilename:@$list@" $LDAP_AUTH_FILE
- fi
-
- #Search username and password
- echo -n "Enter Search user name (if required), default [$LDAP_USER]: "
- read answer5
- if [[ ! -z "$answer5" ]]; then
- LDAP_USER=$answer5
- echo "export LDAP_USER=\"$LDAP_USER\"" >> $LOCAL_TRAF_CONFIG
-
- echo -n "Enter Search password (if required), default [$LDAP_PASSWORD]: "
- read answer6
- if [[ ! -z "$answer6" ]]; then
- LDAP_PASSWORD=$answer6
- echo "export LDAP_PASSWORD=\"$LDAP_PASSWORD\"" >> $LOCAL_TRAF_CONFIG
- fi
- fi
- user="LDAPSearchDN: $LDAP_USER"
- sed -i -e "s/LDAPSearchDN:/$user/g" $LDAP_AUTH_FILE
- password="LDAPSearchPwd: $LDAP_PASSWORD"
- sed -i -e "s/LDAPSearchPwd:/$password/g" $LDAP_AUTH_FILE
- fi
-
-fi
-#==============================================
-#All items added to config file
-#Will add setup complete flag
-
-echo "export CONFIG_COMPLETE=\"true\"" >> $LOCAL_TRAF_CONFIG
-#=============================================
-#Create directories and cp files
-
-sudo mkdir -p $TRAF_CONFIG_DIR
-sudo chmod 777 $TRAF_CONFIG_DIR
-sudo cp $LOCAL_TRAF_CONFIG $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-echo "***INFO: Configuration file: $TRAF_CONFIG"
-
-echo "***INFO: Trafodion configuration setup complete"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e208598d/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 8c45e83..6bf3760 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -413,7 +413,13 @@ else
#Checking if using 1.7.0_n
if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
- error="true"
+ #If Java is **less** than than 1.7.0_65 the next command will fail.
+ #Install will fail anyways if less than 1.7.0_65
+ #Will not fail if Java is 1.7.0_100 or greater
+ #Temporary fix to support Java 7 upgrades greater than 100
+ if [[ "${THIS_JVM_VER:20:3}" -lt $JAVA_65 ]]; then
+ error="true"
+ fi
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e208598d/install/installer/trafodion_apache_hadoop_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_apache_hadoop_install b/install/installer/trafodion_apache_hadoop_install
deleted file mode 100755
index ca36122..0000000
--- a/install/installer/trafodion_apache_hadoop_install
+++ /dev/null
@@ -1,763 +0,0 @@
-#!/bin/bash
-# @@@ START COPYRIGHT @@@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# @@@ END COPYRIGHT @@@
-
-#==============================================
-# Trafodion installation script. Setup Trafodion
-# environment, configuration of HBase with
-# Hbase-trx and co-processors need for Trafodion, and
-# install Trafodion build. All parameters from scripts
-# use configuration file.
-#==============================================
-
-function print_usage {
-cat << EOF
-
-This script will install Trafodion on Apache Hadoop.
-It will create a configuration file (if one has not been created),
-setup of the environment needed for Trafodion,
-configure HBase with Hbase-trx and co-processors needed,
-and install a specified Trafodion build.
-
-Options:
- --help Print this message and exit
- --accept_license If provided, the user agrees to accept all the
- provisions in the Trafodion license. This allows
- for automation by skipping the display and prompt of
- the Trafodion license.
- --config_file If provided, all install prompts will be
- taken from this file and not prompted for.
- --run_scanner If provided, the Trafodion scanner will run
- to check system configuration.
- --no_scanner If provided, the Trafodion scanner will not
- run to check system configuration.
-EOF
-}
-
-#==============================================
-#Parse input
-USER_CONFIG=""
-ACCEPT_LICENSE="N"
-RUN_SCANNER="N"
-
-while [[ $# -gt 0 ]]; do
- case "$1" in
- --help)
- print_usage
- exit -1
- ;;
- --accept_license)
- ACCEPT_LICENSE="Y"
- ;;
- --config_file)
- if [[ -z "$2" ]]; then
- echo "***ERROR: No value passed to param $1."
- print_usage
- exit -1
- fi
- USER_CONFIG=$2
- if [ -f $USER_CONFIG ]; then
- source $USER_CONFIG
- else
- echo "***ERROR: configuration file $USER_CONFIG does not exist"
- exit -1
- fi
- shift
- ;;
- --run_scanner)
- RUN_SCANNER="Y"
- selectedRun="true"
- if [[ $selectedNo == "true" ]]; then
- echo "***ERROR: Selected --run_scanner and --no_scanner. Invalid combination."
- exit -1
- fi
- ;;
- --no_scanner)
- RUN_SCANNER="N"
- selectedNo="true"
- if [[ $selectedRun == "true" ]]; then
- echo "***ERROR: Selected --run_scanner and --no_scanner. Invalid combination."
- exit -1
- fi
- ;;
- *)
- echo "***ERROR: unknown parameter '$1'"
- print_usage
- exit -1
- esac
- shift
-done
-
-
-#==============================================
-echo
-echo "******************************"
-echo " TRAFODION INSTALLATION START"
-echo "******************************"
-echo
-
-#==============================================
-# Default values
-
-export timestamp=$(date +%F-%H-%M-%S)
-export TRAF_LOGDIR="/var/log/trafodion"
-export INSTALL_LOG="$TRAF_LOGDIR/trafodion_apache_hadoop_install_$timestamp.log"
-export SCANNER_LOG="$TRAF_LOGDIR/trafodion_scanner_$timestamp.log"
-#export TRAF_WORKDIR="$( cd "$( dirname "$0" )" && pwd )/.."
-export TRAF_WORKDIR="/usr/lib/trafodion"
-export LOCAL_WORKDIR="$( cd "$( dirname "$0" )" && pwd )"
-export TRAF_CONFIG="/etc/trafodion/trafodion_config"
-export TRAF_CONFIG_DIR=$(dirname $TRAF_CONFIG)
-export TRAF_CONFIG_FILE=$(basename $TRAF_CONFIG)
-export TRAF_USER="trafodion"
-export PDSH="pdsh -R exec"
-export PDSH_SSH_CMD="ssh -q -n %h"
-export PDCP="pdcp -R ssh"
-#==============================================
-#Prechecks
-
-#Check not installing as userid Trafodion
-if [[ "$(whoami)" == "$TRAF_USER" ]]; then
- echo "***ERROR: The Trafodion username cannot be the same as the install username"
- exit -1
-fi
-
-# check that we are running from a userid with sudo access
-sudo echo "***INFO: testing sudo access"
-if [ $? -ne 0 ]; then
- echo "***ERROR: This script must be run from a userid with sudo access."
- exit -1
-fi
-
-#==============================================
-# Setup log & working directories
-
-sudo mkdir -p $TRAF_LOGDIR
-sudo chmod 777 $TRAF_LOGDIR
-touch $INSTALL_LOG
-sudo chmod 777 $INSTALL_LOG
-echo "***INFO: Log file located at $INSTALL_LOG"
-
-sudo mkdir -p $TRAF_CONFIG_DIR
-sudo chmod 777 $TRAF_CONFIG_DIR
-echo "***INFO: Config directory: $TRAF_CONFIG_DIR"
-
-# create a working directory
-sudo mkdir -p $TRAF_WORKDIR
-sudo chmod -R 777 $TRAF_WORKDIR
-echo "***INFO: Working directory: $TRAF_WORKDIR"
-
-# copy install scripts into working directory
-sudo cp -r $(cd "$( dirname "$0" )" && pwd)/ $TRAF_WORKDIR
-sudo cp -rf $LOCAL_WORKDIR $TRAF_WORKDIR
-sudo chmod -R 777 $TRAF_WORKDIR
-#=============================================
-# Shutdown Trafodion if it is running
-
-userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l`
-
-if [[ "$userForTrafodion" != "0" ]]; then
- isTrafUp=$(sudo su $TRAF_USER --login --command "sqcheck" 2>/dev/null)
-
- trafodionRunning=$(echo $isTrafUp | grep "The SQ environment is up" | wc -l)
- if [[ "$trafodionRunning" -eq "1" ]]; then
- echo "***ERROR: Trafodion is still running."
- echo -n "Stop Trafodion (Y/N), default is N: "
- read answer
-
- if [ -z $answer ]; then
- echo "***ERROR: Please stop Trafodion then rerun trafodion_apache_hadoop_install"
- echo "***ERROR: Change to trafodion userid then do a 'sqstop'"
- exit -1
- else
- if [[ "${answer}" =~ ^[Yy]$ ]]; then
- echo "***INFO: Stopping Trafodion instance."
- sudo su $TRAF_USER --login --command "sqstop"
- sudo su $TRAF_USER --login --command "ckillall"
- else
- echo "***ERROR: Please stop Trafodion then rerun trafodion_apache_hadoop_install"
- echo "***ERROR: Change to trafodion user id then do a 'sqstop'"
- exit -1
- fi
- fi
- fi
-fi
-
-#==============================================
-# config file
-
-# if user did not supply their own config file, use the default
-# or prompt to generate a new one.
-if [ -z "$USER_CONFIG" ]; then
- if [ -f $TRAF_CONFIG ]; then
- # strip out LOCAL_WORKDIR from config file, if there.
- # LOCAL_WORKDIR was erroneously saved to the config file in
- # previous versions of the installer scripts and since the config
- # file hangs around between installer runs it needs to be stripped
- # out here before we source in the config file
- cp $TRAF_CONFIG config_temp
- sudo grep -vE "LOCAL_WORKDIR" config_temp > $TRAF_CONFIG 2> /dev/null
- source $TRAF_CONFIG
- fi
-
- # prompt user for configuration info
- $LOCAL_WORKDIR/traf_apache_hadoop_config_setup | tee -a $INSTALL_LOG
- if [ ${PIPESTATUS[0]} != "0" ]; then
- echo "***ERROR: Error while running traf_apache_hadoop_config_setup." | tee -a $INSTALL_LOG
- echo "***ERROR: No configuration file created." | tee -a $INSTALL_LOG
- exit -1
- fi
-else
- # copy the user's config file to the default location
- sudo cp $USER_CONFIG $TRAF_CONFIG
- if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy $USER_CONFIG to $TRAF_CONFIG"
- exit -1
- fi
- #$LOCAL_WORKDIR/traf_getHadoopNodes | tee -a $INSTALL_LOG
- sudo chmod 777 $TRAF_CONFIG
-fi
-
-source $TRAF_CONFIG
-if [ $? -ne 0 ]; then
- echo "***ERROR: unable to source $TRAF_CONFIG"
- exit -1
-fi
-
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/INSTALL_LOG\=/d' $TRAF_CONFIG
-echo "export INSTALL_LOG=\"$INSTALL_LOG\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-source $TRAF_CONFIG
-
-
-#==============================================
-#Check if doing an upgrade
-
-if [[ $CONFIG_COMPLETE ]]; then
- userForTrafodion=`grep "$TRAF_USER:" /etc/passwd | wc -l`
- if [[ "$userForTrafodion" == "0" ]]; then
- UPGRADE_TRAF=false;
- else
- UPGRADE_TRAF=true;
- fi
-
- #Add upgrade variable to config file
- sudo chmod 777 $TRAF_CONFIG
- sed -i '/UPGRADE_TRAF\=/d' $TRAF_CONFIG
- echo "export UPGRADE_TRAF=\"$UPGRADE_TRAF\"" >> $TRAF_CONFIG
- sudo chmod 777 $TRAF_CONFIG
- source $TRAF_CONFIG
-fi
-
-#==============================================
-#Run Trafodion scanner
-
-if [[ $UPGRADE_TRAF == "true" ]]; then
- echo "***INFO: Trafodion scanner will not be run."
-else
- if [[ "$RUN_SCANNER" == "Y" ]]; then
- echo "***INFO: Running Trafodion Scanner"
- $LOCAL_WORKDIR/tools/trafodion_scanner -l $SCANNER_LOG -t $TRAF_CONFIG \
- -c $LOCAL_WORKDIR/tools/trafodion_scanner.cfg | tee -a $INSTALL_LOG
-
- returnCode=${PIPESTATUS[0]}
-
- case $returnCode in
-
- 2|1)
- echo "***ERROR: Error while running trafodion_scanner."
- echo "***ERROR: Please review logs and fix listed issue(s)."
- exit -1
- ;;
- 3|0)
- echo "***INFO: Trafodion scanner ran without error. Install will continue..."
- ;;
- *)
- echo "***ERROR: Error while running trafodion_scanner."
- exit -1
- ;;
- esac
- else
- echo "***INFO: Trafodion scanner will not be run."
- fi
-fi
-
-#=============================================
-
-if [ $node_count -eq 1 ]; then
- TRAF_PDSH=""
- TRAF_PDCP=""
-else
- TRAF_PDSH="pdsh -R exec $MY_NODES $PDSH_SSH_CMD"
- TRAF_PDCP="pdcp -R ssh $MY_NODES"
-fi
-
-sed -i '/ACCEPT_LICENSE\=/d' $TRAF_CONFIG
-echo "export ACCEPT_LICENSE=\"$ACCEPT_LICENSE\"" >> $TRAF_CONFIG
-
-
-#==============================================
-# untar package and files into /usr/lib/trafodion (the new TRAF_WORKDIR)
-# This will be a global location that all tar files are untarred into
-
-# if we have the package tar file we need to extract
-# trafodion core and dcs and rest-server builds from it
-if [ ! -z $TRAF_PACKAGE ]; then
-
- # create directory to contain build tar files using the
- # timestamp from the package filename
- traf_filename=$(basename "$TRAF_PACKAGE")
- UNTAR_DIR="$TRAF_WORKDIR/${traf_filename%.tar.gz}"
- sudo mkdir -p $UNTAR_DIR
- sudo chmod 755 $UNTAR_DIR
-
- # untar the package
- sudo tar -xzf $TRAF_PACKAGE --directory=$UNTAR_DIR
-
- build_file=$(ls $UNTAR_DIR | grep "trafodion_.*server")
- if [[ -z $build_file ]]; then
- echo "***ERROR: trafodion_server-*.tgz could not be found in $UNTAR_DIR"
- exit -1
- fi
- TRAF_BUILD=$UNTAR_DIR/$build_file
-
- build_file=$(ls $UNTAR_DIR | grep "dcs")
- DCS_BUILD=$UNTAR_DIR/$build_file
-
- build_file=$(ls $UNTAR_DIR | grep "rest")
- if [ -z $build_file ]; then
- REST_BUILD=""
- else
- REST_BUILD=$UNTAR_DIR/$build_file
- fi
-
-else
- # we don't have a package and only have the trafodion and dcs build tar files
- # we can't use the package filename timestamp since we don't have a package tar
- # file so we'll just create a directory using the current time
- UNTAR_DIR="$TRAF_WORKDIR/traf_$(date +%F_%H%M)"
- sudo mkdir -p $UNTAR_DIR
- sudo chmod 777 $UNTAR_DIR
-
- sudo cp $TRAF_BUILD $UNTAR_DIR
- if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy trafodion build ($TRAF_BUILD) to $UNTAR_DIR"
- exit -1
- fi
-
- sudo cp $DCS_BUILD $UNTAR_DIR
- if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy DCS build ($DCS_BUILD) to $UNTAR_DIR"
- exit -1
- fi
-
- if [ ! -z $REST_BUILD ]; then
- sudo cp $REST_BUILD $UNTAR_DIR
- if [ $? -ne 0 ]; then
- echo "***ERROR: unable to copy REST build ($REST_BUILD) to $UNTAR_DIR"
- exit -1
- fi
- fi
-
- build_file=$(basename $TRAF_BUILD)
- TRAF_BUILD=$UNTAR_DIR/$build_file
-
- sudo tar -xzf $TRAF_BUILD --directory=$UNTAR_DIR
-
- build_file=$(basename $DCS_BUILD)
- DCS_BUILD=$UNTAR_DIR/$build_file
-
- build_file=$(basename $REST_BUILD)
- REST_BUILD=$UNTAR_DIR/$build_file
-
-fi
-
-sed -i '/TRAF_BUILD\=/d' $TRAF_CONFIG
-echo "export TRAF_BUILD=\"$TRAF_BUILD\"" >> $TRAF_CONFIG
-sed -i '/DCS_BUILD\=/d' $TRAF_CONFIG
-echo "export DCS_BUILD=\"$DCS_BUILD\"" >> $TRAF_CONFIG
-sed -i '/REST_BUILD\=/d' $TRAF_CONFIG
-echo "export REST_BUILD=\"$REST_BUILD\"" >> $TRAF_CONFIG
-
-# add the untar directory to the config file
-sed -i '/UNTAR_DIR\=/d' $TRAF_CONFIG
-echo "export UNTAR_DIR=\"$UNTAR_DIR\"" >> $TRAF_CONFIG
-source $TRAF_CONFIG
-
-#============================================
-#If user supplied a config file must now check if install_features file
-#exists
-
-if [[ -n "$USER_CONFIG" ]]; then
- #Check if install_features file exists
- if [[ -z $CDH_5_3_HDP_2_2_SUPPORT ]]; then
- install_features_path=$(tar -tf $TRAF_BUILD | grep "install_features")
- if [[ ! -z $install_features_path ]]; then
- tar -xzf $TRAF_BUILD $install_features_path
- source $install_features_path
- echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
- else
- CDH_5_3_HDP_2_2_SUPPORT="N"
- echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG
- fi
- fi
-fi
-
-#==============================================
-#Check to make sure HBase Version is the correct version
-
-
-for node in $HADOOP_NODES;
-do
- ssh -q -n $node 'echo "exit" | hbase shell &> $HOME/hbaseVersion.txt'
- hbaseInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | wc -l)
- if [[ $hbaseInstalled -eq "1" ]]; then
-
- version=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
- hbaseVersion=$(echo "${version#*.}"| cut -f1 -d".")
- if [[ $hbaseVersion -lt "98" ]]; then
- echo "***ERROR: HBase installed must be 0.98"
- exit -1
- fi
- hbaseVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/-.*//' | awk {'print$2'})
- break
- fi
-
-done
-
-
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/hbaseVersion\=/d' $TRAF_CONFIG
-echo "export hbaseVersion=\"$hbaseVersion\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-sudo rm -rf hbaseVersion.txt
-
-trafodionFullName=$(basename $TRAF_BUILD)
-echo "***DEBUG: trafodionFullName=$trafodionFullName"
-#Debug version
-trafodionVersion=$(echo $trafodionFullName | sed 's/trafodion_.*server-//' | sed 's/-debug//' | sed 's/.tgz//')
-
-echo "***INFO: Trafodion version = $trafodionVersion"
-#==============================================
-# Determine Trafodion version by parsing it
-# from the trafodion_server tar file.
-# Determine Java version
-
-cd $UNTAR_DIR
-
-# clean up any old files left lying around
-sudo rm -rf $UNTAR_DIR/export/lib 2>/dev/null
-
-# extract the hbase-trx jar file (and others) from the build tar file
-sudo tar -xzf $TRAF_BUILD export/lib 2>&1 | tee -a $INSTALL_LOG
-if [ ${PIPESTATUS[0]} != 0 ]; then
- echo "***ERROR: unable to find export/lib/ directory in $TRAF_BUILD" 2>&1 | tee -a $INSTALL_LOG
- exit -1
-fi
-
-# Detect java version
-
-for node in $HADOOP_NODES
-do
- java_exec=$(ssh -q -n $node ps -C java --noheader -o pid,user,cmd \
- | grep --max-count=1 "hbase" \
- | awk '{print $3}' )
- echo "***DEBUG: HBase's java_exec=$java_exec"
- if [ ! -z $java_exec ]; then
- JAVA_VERSION=$(ssh -q -n $node $java_exec -version 2>&1)
- break;
- echo "***ERROR: Unable to determine HBase's Java version"
- echo "***ERROR: Check that HBase is up on node $HOSTNAME"
- exit -1
- fi
-done
-
-if [[ -z $JAVA_VERSION ]]; then
- echo "***ERROR: Unable to determine HBase's Java version"
- echo "***ERROR: Check that apache HBase is up"
- exit -1
-else
- JAVA_VERSION=$(echo $JAVA_VERSION \
- | grep version \
- | awk '{print $3}' \
- | sed -e 's@"@@g')
-fi
-
-# test for java 1.7
-java_17=$(echo $JAVA_VERSION | grep "1.7." | wc -l)
-
-# if not java 1.7 then test for java 1.6
-if [ "$java_17" == "0" ]; then
- java_16=$(echo $JAVA_VERSION | grep "1.6." | wc -l)
-
- # if not 1.7 nor 1.6 then we have a problem
- if [ "$java_16" == "0" ]; then
- echo "***ERROR: Unsupported HBase java version. HBase java version must be 1.6 or 1.7"
- exit -1
- else
- JAVA_VERSION="1.6"
- fi
-else
- JAVA_VERSION="1.7"
-fi
-
-sudo chmod 777 $TRAF_CONFIG
-sed -i '/JAVA_VERSION\=/d' $TRAF_CONFIG
-echo "export JAVA_VERSION=\"$JAVA_VERSION\"" >> $TRAF_CONFIG
-sudo chmod 777 $TRAF_CONFIG
-#==============================================
-# Run trafodion_setup
-echo
-echo "******************************"
-echo " TRAFODION SETUP"
-echo "******************************"
-echo
-
-if [[ "$UPGRADE_TRAF" == "true" ]]; then
-
- sed -i -e "s@export NODE_LIST=.*@export NODE_LIST=\"$NODE_LIST\"@" $HOME_DIR/$TRAF_USER/.bashrc
- sed -i -e "s@export MY_NODES=.*@export MY_NODES=\"$NODE_LIST\"@" $HOME_DIR/$TRAF_USER/.bashrc
-
- for node in $NODE_LIST
- do
- userForTrafodion=$(ssh -q -n $node grep "$TRAF_USER:" /etc/passwd | wc -l)
- if [[ "$userForTrafodion" == 0 ]]; then
- $LOCAL_WORKDIR/traf_setup | tee -a $INSTALL_LOG
- if [ ${PIPESTATUS[0]} != "0" ]; then
- echo "***ERROR: Error while running traf_setup." | tee -a $INSTALL_LOG
- echo "***ERROR: Setup not complete, review logs." | tee -a $INSTALL_LOG
- echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
- exit -1
- else
- echo "***INFO: Trafodion environment setup completed" | tee -a $INSTALL_LOG
- fi
- fi
- done
-
-else
- $LOCAL_WORKDIR/traf_setup | tee -a $INSTALL_LOG
-
- if [ ${PIPESTATUS[0]} != "0" ]; then
- echo "***ERROR: Error while running traf_setup." | tee -a $INSTALL_LOG
- echo "***ERROR: Setup not complete, review logs." | tee -a $INSTALL_LOG
- echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
- exit -1
- else
- echo "***INFO: Trafodion environment setup completed" | tee -a $INSTALL_LOG
- fi
-fi
-
-# create working directories on all nodes
-$TRAF_PDSH sudo mkdir -p $TRAF_WORKDIR
-$TRAF_PDSH sudo chmod 777 $TRAF_WORKDIR
-$TRAF_PDSH sudo mkdir -p $LOCAL_WORKDIR
-$TRAF_PDSH sudo chmod 777 $LOCAL_WORKDIR
-
-# copy config file to all nodes
-if [ $node_count -ne 1 ]; then
- cp $TRAF_CONFIG $LOCAL_WORKDIR
- $TRAF_PDCP $LOCAL_WORKDIR/$TRAF_CONFIG_FILE $LOCAL_WORKDIR
- $TRAF_PDSH sudo mkdir -p $TRAF_CONFIG_DIR
- $TRAF_PDSH sudo cp $LOCAL_WORKDIR/$TRAF_CONFIG_FILE $TRAF_CONFIG_DIR
- $TRAF_PDSH sudo chmod 777 $TRAF_CONFIG
-fi
-
-
-$LOCAL_WORKDIR/traf_sqconfig
-if [ $? != 0 ]; then
- echo "***ERROR: traf_sqconfig script failed."
- echo "***ERROR: sqconfig file not created."
- exit -1
-fi
-#Reserve DCS Ports
-
-echo "***INFO: Reserving DCS ports"
-trafodion_ports=${DCS_MASTER_PORT:-23400},${DCS_MASTER_INFO_PORT:-24400}
-reservedTrafodionPorts="net.ipv4.ip_local_reserved_ports = ${trafodion_ports}"
-
-for node in $NODE_LIST
-do
- redhatSystem=$(ssh -q -n $node '/sbin/sysctl net.ipv4.ip_local_reserved_ports | wc -l')
- if [[ "$redhatSystem" -ge "1" ]]; then
- reserved_ports=$(ssh -q -n $node '/sbin/sysctl net.ipv4.ip_local_reserved_ports' | awk -F'=' '{print $2;}' | sed 's/^ //')
- ssh -q -n $node 'sudo chmod 777 /etc/sysctl.conf'
- ssh -q -n $node 'sudo sed -i '/net.ipv4.ip_local_reserved_ports""\=*/d' /etc/sysctl.conf'
-
- if [[ -z "${reserved_ports}" ]]; then
- ssh -q -n $node "sudo echo "$reservedTrafodionPorts" >> /etc/sysctl.conf"
- else
- ssh -q -n $node "sudo echo "$reservedTrafodionPorts","$reserved_ports" >> /etc/sysctl.conf"
- fi
- ssh -q -n $node 'sudo chmod 644 /etc/sysctl.conf'
- ssh -q -n $node 'sudo /sbin/sysctl -p' 2>&1 > /dev/null
- else
- echo "***ERROR: Unable to reserve DCS ports (${trafodion_ports})."
- exit -1
- fi
-done
-
-#Set Max kernel pid
-
-$TRAF_PDSH sudo sysctl -w kernel.pid_max=65535
-
-
-#Create install directory
-if [[ "$node_count" -ne "1" ]]; then
- $TRAF_PDSH sudo mkdir -p /$HOME_DIR/$TRAF_USER/installer &> /dev/null
-fi
-
-#Copy over traf_authentication_config file to all nodes
-if [[ "$LDAP_SECURITY" == "Y" ]]; then
- echo "***INFO: Copying $LDAP_AUTH_FILE to Trafodion home dir"
-
- if [[ "$node_count" -eq "1" ]]; then
- sudo cp -r $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER
- sudo chown trafodion.trafodion $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- sudo chmod 750 $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- if [[ $LDAP_LEVEL == "2" ]] || [[ $LDAP_LEVEL == "1" ]]; then
- echo "***INFO: Copying $LDAP_CERT to Trafodion home dir"
- sudo cp -r $LDAP_CERT $HOME_DIR/$TRAF_USER
- sudo chown trafodion.trafodion $HOME_DIR/$TRAF_USER/$LDAP_CERT_BASE
- sudo chmod 750 $HOME_DIR/$TRAF_USER/$LDAP_CERT_BASE
- fi
- else
- $TRAF_PDCP $LOCAL_WORKDIR/$LDAP_AUTH_FILE $HOME
- $TRAF_PDSH sudo cp -r $HOME/$LDAP_AUTH_FILE $HOME_DIR/$TRAF_USER
- $TRAF_PDSH sudo chown trafodion.trafodion $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- $TRAF_PDSH sudo chmod 750 $HOME_DIR/$TRAF_USER/$LDAP_AUTH_FILE
- if [[ $LDAP_LEVEL == "2" ]] || [[ $LDAP_LEVEL == "1" ]]; then
- echo "***INFO: Copying $LDAP_CERT to Trafodion home dir"
- $TRAF_PCP $LDAP_CERT $HOME
- $TRAF_PDSH sudo cp -r $HOME/$LDAP_CERT_BASE $HOME_DIR/$TRAF_USER
- $TRAF_PDSH sudo chown trafodion.trafodion $HOME_DIR/$TRAF_USER/$LDAP_CERT_BASE
- $TRAF_PDSH sudo chmod 750 $HOME_DIR/$TRAF_USER/$LDAP_CERT_BASE
- fi
- fi
-fi
-#=============================================
-#Run trafodion_mods
-
-echo
-echo "******************************"
-echo " TRAFODION MODS"
-echo "******************************"
-echo
-
-hbase_trx_jar=hbase-trx-hbase*.jar
-
-echo "***INFO: copying $hbase_trx_jar to HBase lib"
-if [ $node_count -ne 1 ]; then
- # if more than one node then copy to all nodes
- $TRAF_PDSH sudo rm -rf $HBASE_HOME/lib/hbase-trx* 2>/dev/null
- $TRAF_PDSH sudo chmod 777 $UNTAR_DIR/export/lib
- $TRAF_PDSH sudo cp $UNTAR_DIR/export/lib/$hbase_trx_jar $LOCAL_WORKDIR
- $TRAF_PDSH sudo cp $LOCAL_WORKDIR/$hbase_trx_jar $LOCAL_WORKDIR
- $TRAF_PDSH sudo cp $LOCAL_WORKDIR/$hbase_trx_jar $HBASE_HOME/lib
- $TRAF_PDSH sudo chmod 644 $HBASE_HOME/lib/$hbase_trx_jar
- $TRAF_PDSH sudo rm $LOCAL_WORKDIR/$hbase_trx_jar 2>/dev/null
-else
- sudo rm -rf $HBASE_HOME/lib/hbase-trx* 2>/dev/null
- sudo mkdir -p $TRAF_WORKDIR 2>/dev/null
- sudo chmod 777 $TRAF_WORKDIR
- sudo chmod 777 $UNTAR_DIR/export/lib
- sudo cp $UNTAR_DIR/export/lib/$hbase_trx_jar $TRAF_WORKDIR
- sudo cp $TRAF_WORKDIR/$hbase_trx_jar $HBASE_HOME/lib
- sudo chmod 644 $HBASE_HOME/lib/$hbase_trx_jar
-
-fi
-
-
-# modify hbase-site.xml directly
-echo "***INFO: modifying hbase-site.xml"
-HBASE_XML=$HBASE_HOME/conf/hbase-site.xml
-sudo cp -f $HBASE_XML ${HBASE_XML}.orig
-
-if [[ `grep -c "TrxRegionObserver" $HBASE_XML` -eq 0 ]]; then
-
- sudo sed -i '/<\/configuration>/d' $HBASE_XML
-
- sudo cat >> $HBASE_XML <<EOF
-<property>
- <name>hbase.client.scanner.caching</name>
- <value>100</value>
-</property>
-<property>
- <name>hbase.coprocessor.region.classes</name>
- <value>
- org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,
- org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,
- org.apache.hadoop.hbase.coprocessor.AggregateImplementation
- </value>
-</property>
-<property>
- <name>hbase.hregion.impl</name>
- <value>org.apache.hadoop.hbase.regionserver.transactional.TransactionalRegion</value>
-</property>
-</configuration>
-EOF
-
- if [ $node_count -ne 1 ]; then
- $TRAF_PDSH sudo cp -f ${HBASE_XML}.orig $HBASE_HOME/conf
- $TRAF_PDSH sudo cp -f $HBASE_XML $HBASE_HOME/conf
- fi
-fi
-
-# restart HBase
-$HBASE_HOME/bin/stop-hbase.sh
-sleep 5
-$HBASE_HOME/bin/start-hbase.sh
-if [[ $? -eq 0 ]]; then
- echo "***INFO: HBase restart completed successfully"
-else
- echo "***ERROR: Failed to restart apache HBase"
- exit -1
-fi
-
-
-echo "***INFO: Trafodion Mods ran successfully."
-
-#==============================================
-#Install Trafodion
-echo
-echo "******************************"
-echo " TRAFODION START"
-echo "******************************"
-echo
-sudo mkdir -p $SQ_ROOT
-sudo chown $TRAF_USER.trafodion $SQ_ROOT
-/bin/cp -rf $LOCAL_WORKDIR/traf_config $TRAF_WORKDIR/installer/traf_config
-
-sudo su $TRAF_USER --command "$TRAF_WORKDIR/installer/traf_config" 2>&1 | tee -a $INSTALL_LOG
-
-if [ ${PIPESTATUS[0]} != "0" ]; then
- echo "***ERROR: Error while running traf_config." | tee -a $INSTALL_LOG
- echo "***ERROR: Setup not complete, review logs." | tee -a $INSTALL_LOG
- echo "***ERROR: Exiting...." | tee -a $INSTALL_LOG
- exit -1
-fi
-
-#==============================================
-echo
-echo "*********************************"
-echo " TRAFODION INSTALLATION COMPLETE"
-echo "*********************************"
-echo
[10/39] incubator-trafodion git commit: [TRAFODION-1973] Fix
unpacking of hadoop dependencies
Posted by db...@apache.org.
[TRAFODION-1973] Fix unpacking of hadoop dependencies
Issue found while testing build environment setup for release 2.0.
Simple fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dee95868
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dee95868
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dee95868
Branch: refs/heads/master
Commit: dee95868a932834ded7f07ad61cba2e767a4ae13
Parents: af67497
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu May 5 00:58:43 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu May 5 00:58:43 2016 +0000
----------------------------------------------------------------------
install/traf_tools_setup.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dee95868/install/traf_tools_setup.sh
----------------------------------------------------------------------
diff --git a/install/traf_tools_setup.sh b/install/traf_tools_setup.sh
index 956cd59..10667e4 100755
--- a/install/traf_tools_setup.sh
+++ b/install/traf_tools_setup.sh
@@ -410,6 +410,7 @@ fi
# -----------------------------------------------------------------------------
# download hadoop/hdfs libs
+cd $BASEDIR
echo
echo "INFO: Hadoop/HDFS libs on $(date)" | tee -a $LOGFILE
HVER="2.6.0"
[04/39] incubator-trafodion git commit: Fix for TRAFODION-1948 Drop
schema cascade internally selects against objects table. The fix is to use a
distinct clause in the internal select query.
Posted by db...@apache.org.
Fix for TRAFODION-1948
Drop schema cascade internally selects against objects table.
The fix is to use a distinct clause in the internal select query.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6e674c65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6e674c65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6e674c65
Branch: refs/heads/master
Commit: 6e674c65c2a9ebd05c53f8a88b4464601a24808f
Parents: 5dc6754
Author: Prashant Vasudev <pr...@esgyn.com>
Authored: Thu Apr 28 21:12:17 2016 +0000
Committer: Prashant Vasudev <pr...@esgyn.com>
Committed: Thu Apr 28 21:12:17 2016 +0000
----------------------------------------------------------------------
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6e674c65/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
index d37306b..c36f62c 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
@@ -503,7 +503,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
// they always get removed when the parent table is dropped.
// Filter out the LOB depenedent tables too - they will get dropped when
//the main LOB table is dropped.
- str_sprintf(query,"SELECT TRIM(object_name), TRIM(object_type) "
+ str_sprintf(query,"SELECT distinct TRIM(object_name), TRIM(object_type) "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
"object_name <> '"SEABASE_SCHEMA_OBJECTNAME"' AND "
[07/39] incubator-trafodion git commit: Fix for TRAFODION-1923
Posted by db...@apache.org.
Fix for TRAFODION-1923
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ac298d39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ac298d39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ac298d39
Branch: refs/heads/master
Commit: ac298d39e93c221fd18ab7377fc830d31dba2659
Parents: 29fb212
Author: Prashant Vasudev <pr...@esgyn.com>
Authored: Wed May 4 00:15:51 2016 +0000
Committer: Prashant Vasudev <pr...@esgyn.com>
Committed: Wed May 4 00:15:51 2016 +0000
----------------------------------------------------------------------
.../TransactionalScanner.java.tmpl | 6 ++-
.../transactional/SplitBalanceHelper.java | 51 ++++++++++++++++++--
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/tools/runregr_executor.ksh | 2 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
6 files changed, 59 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ac298d39/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl
index 40bbeeb..618cd85 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl
@@ -105,7 +105,7 @@ public class TransactionalScanner extends AbstractClientScanner {
@Override
public void close() {
- if(LOG.isTraceEnabled()) LOG.trace("close() -- ENTRY txID: " + ts.getTransactionId());
+ if(LOG.isTraceEnabled()) LOG.trace("close() -- ENTRY txID: " + ts.getTransactionId() + " " + this.ttable );
if(closed) {
if(LOG.isTraceEnabled()) LOG.trace("close() already closed -- EXIT txID: " + ts.getTransactionId());
return;
@@ -138,6 +138,10 @@ public class TransactionalScanner extends AbstractClientScanner {
}
}
catch(ServiceException se) {
+ if(LOG.isErrorEnabled())
+ LOG.error("close() -- CloseScanner ServiceException txID: " + ts.getTransactionId() +
+ "Exception :" , se);
+
this.interrupted = true;
this.closed = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ac298d39/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
index 0d76b55..c1c23ce 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
@@ -25,7 +25,9 @@ package org.apache.hadoop.hbase.coprocessor.transactional;
import java.io.IOException;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -36,6 +38,7 @@ import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.transactional.TransactionalRegionScannerHolder;
import org.apache.hadoop.hbase.regionserver.transactional.TrxTransactionState;
+import org.apache.hadoop.hbase.regionserver.transactional.TransactionState;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
@@ -240,8 +243,45 @@ public class SplitBalanceHelper {
}
}
- protected boolean scannersListClear(ConcurrentHashMap<Long, TransactionalRegionScannerHolder> scanners) throws IOException {
- return scanners.isEmpty();
+ //Returning true indicates scannerList is Clear.
+ protected boolean scannersListClear(ConcurrentHashMap<Long, TransactionalRegionScannerHolder> scanners,
+ ConcurrentHashMap<String, TrxTransactionState> transactionsById) throws IOException {
+ if(scanners.isEmpty())
+ {
+ if (LOG.isDebugEnabled()) LOG.debug("scannersListClear Scanners is empty: " + hri.getRegionNameAsString());
+ return true;
+ }
+ else
+ {
+ if (LOG.isDebugEnabled()) LOG.debug("scannersListClear Scanners is not empty: " + hri.getRegionNameAsString());
+ Iterator<Map.Entry<Long, TransactionalRegionScannerHolder>> scannerIter = scanners.entrySet().iterator();
+ TransactionalRegionScannerHolder rsh = null;
+ Map.Entry<Long, TransactionalRegionScannerHolder> entry;
+ while(scannerIter.hasNext())
+ {
+ entry = scannerIter.next();
+ rsh = entry.getValue();
+ if (rsh != null)
+ {
+ if (LOG.isDebugEnabled()) LOG.debug("scannersListClear Active Scanner is: "+ rsh.scannerId +
+ " Txid: "+ rsh.transId + " Region: " + hri.getRegionNameAsString());
+ String key = hri.getRegionNameAsString() + rsh.transId;
+ TrxTransactionState trxState = transactionsById.get(key);
+
+ //if trxState is present means there is activity with this region.
+ //Hence don't return true.
+ if(trxState != null)
+ {
+ LOG.info("scannersListClear Active Scanner found, ScannerId: " +
+ rsh.scannerId + " Txid: "+ rsh.transId + " Region: " + hri.getRegionNameAsString());
+ return false;
+
+ }
+ }
+ }
+ //Reaching here means, there is no active scanner.
+ return true;
+ }
}
protected void pendingWait(Set<TrxTransactionState> commitPendingTransactions, int pendingDelayLen) throws IOException {
@@ -258,6 +298,7 @@ public class SplitBalanceHelper {
}
}
+ /*
protected void scannersWait(ConcurrentHashMap<Long, TransactionalRegionScannerHolder> scanners, int pendingDelayLen)
throws IOException {
int count = 1;
@@ -272,11 +313,13 @@ public class SplitBalanceHelper {
}
}
}
+ */
protected void pendingAndScannersWait(Set<TrxTransactionState> commitPendingTransactions,
- ConcurrentHashMap<Long, TransactionalRegionScannerHolder> scanners, int pendingDelayLen) throws IOException {
+ ConcurrentHashMap<Long, TransactionalRegionScannerHolder> scanners,
+ ConcurrentHashMap<String, TrxTransactionState> transactionsById, int pendingDelayLen) throws IOException {
int count = 1;
- while (!scannersListClear(scanners) || !pendingListClear(commitPendingTransactions)) {
+ while (!scannersListClear(scanners, transactionsById) || !pendingListClear(commitPendingTransactions)) {
try {
if (LOG.isDebugEnabled()) LOG.debug("pendingAndScannersWait() delay, count " + count++ + " on: " + hri.getRegionNameAsString());
Thread.sleep(pendingDelayLen);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ac298d39/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
index 7de9391..5c087af 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
@@ -686,7 +686,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
else {
blockNonPhase2.set(true);
closing.set(true);
- sbHelper.pendingAndScannersWait(commitPendingTransactions, scanners, pendingDelayLen);
+ sbHelper.pendingAndScannersWait(commitPendingTransactions, scanners, transactionsById, pendingDelayLen);
sbHelper.setSplit();
}
@@ -765,7 +765,7 @@ public void createRecoveryzNode(int node, String encodedName, byte [] data) thro
LOG.debug("preClose -- setting close var to true on: " + region.getRegionInfo().getRegionNameAsString());
}
try {
- sbHelper.pendingAndScannersWait(commitPendingTransactions, scanners, pendingDelayLen);
+ sbHelper.pendingAndScannersWait(commitPendingTransactions, scanners, transactionsById, pendingDelayLen);
} catch(IOException ioe) {
LOG.error("Encountered exception when calling pendingAndScannersWait(): " + ioe);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ac298d39/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 1591e9a..2c77f8d 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -2857,7 +2857,6 @@ short DDLExpr::ddlXnsInfo(NABoolean &isDDLxn, NABoolean &xnCanBeStarted)
if ((ddlNode && ddlNode->castToStmtDDLNode() &&
ddlNode->castToStmtDDLNode()->ddlXns()) &&
((ddlNode->getOperatorType() == DDL_CLEANUP_OBJECTS) ||
- (ddlNode->getOperatorType() == DDL_DROP_SCHEMA) ||
(ddlNode->getOperatorType() == DDL_ALTER_TABLE_DROP_COLUMN) ||
(ddlNode->getOperatorType() == DDL_ALTER_TABLE_ALTER_COLUMN_DATATYPE)))
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ac298d39/core/sql/regress/tools/runregr_executor.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_executor.ksh b/core/sql/regress/tools/runregr_executor.ksh
index 21215b3..3411009 100755
--- a/core/sql/regress/tools/runregr_executor.ksh
+++ b/core/sql/regress/tools/runregr_executor.ksh
@@ -237,7 +237,7 @@ skippedfiles=
# sbtestfiles contains the list of tests to be run in seabase mode
if [ "$seabase" -ne 0 ]; then
- sbtestfiles="TEST001 TEST002 TEST012 TEST013 TEST014 TEST015 TEST016 TEST020 TEST022 TEST025 TEST050 TEST063 TEST088 TEST101 TEST107 TEST122 TEST130 TEST131 TEST140"
+ sbtestfiles="TEST001 TEST002 TEST012 TEST013 TEST014 TEST015 TEST016 TEST020 TEST022 TEST025 TEST050 TEST063 TEST088 TEST101 TEST106 TEST107 TEST122 TEST130 TEST131 TEST140"
sbprettyfiles=
for i in $prettyfiles; do
for j in $sbtestfiles; do
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ac298d39/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
----------------------------------------------------------------------
diff --git a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
index 4a9bc07..4bc9bfd 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
@@ -982,7 +982,8 @@ public class HTableClient {
} else {
scanner = table.getScanner(scan,dopParallelScanner);
}
- if (logger.isTraceEnabled()) logger.trace("startScan(). After getScanner. Scanner: " + scanner+" dop:"+dopParallelScanner);
+ if (logger.isTraceEnabled()) logger.trace("startScan(). After getScanner. Scanner: " + scanner+ " dop:"+
+ dopParallelScanner + "TransID " + transID + " " + useTRexScanner + " " + getTableName());
}
else
{
@@ -1733,6 +1734,8 @@ public class HTableClient {
future = null;
}
if (scanner != null) {
+ if (logger.isTraceEnabled()) logger.trace("scanner.close() " + tableName + " " + scanner + " "
+ + retcode );
scanner.close();
scanner = null;
}
[38/39] incubator-trafodion git commit: [TRAFODION-1977] Merge
forward release2.0 changes to master
Posted by db...@apache.org.
[TRAFODION-1977] Merge forward release2.0 changes to master
Includes all changes from release2.0 branch as of 2.0.0rc3 tag.
The major change coming forward is packaging changes associated with
TRAFODION-1982.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/60ef89d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/60ef89d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/60ef89d3
Branch: refs/heads/master
Commit: 60ef89d3467042a2c3651e43709b85efe147bc25
Parents: c41b39b 9415d7f
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu May 19 18:14:23 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu May 19 18:14:23 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 40 +-
core/rest/src/assembly/all.xml | 11 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
core/sqf/sql/scripts/install_traf_components | 50 +-
.../TransactionalScanner.java.tmpl | 2 +-
.../transactional/SplitBalanceHelper.java | 51 +-
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
install/installer/dcs_installer | 19 +-
install/installer/rest_installer | 21 +-
.../installer/traf_apache_hadoop_config_setup | 842 --------
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +-
install/installer/traf_config_check | 44 +-
install/installer/traf_config_setup | 69 +-
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
.../installer/trafodion_apache_hadoop_install | 763 --------
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
install/traf_tools_setup.sh | 1 +
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
43 files changed, 2207 insertions(+), 4186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/Makefile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/rest/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --cc core/sqf/sql/scripts/install_traf_components
index 921de71,9a19f2d..8335090
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@@ -105,12 -105,12 +105,12 @@@ echo | tee -a ${MY_LOG_FILE
if [ -d dcs-* ]; then
echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
else
- if [[ -f $DCS_TAR ]]; then
- echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $DCS_BLD ]]; then
+ echo "Using DCS Build: $DCS_BLD" | tee -a ${MY_LOG_FILE}
elif [[ -d $DCS_SRC ]]; then
- echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
- echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
+ echo "DCS built target was not found in $DCS_SRC" | tee -a ${MY_LOG_FILE}
+ echo "Building DCS" | tee -a ${MY_LOG_FILE}
- if [[ -f $MY_SQROOT/export/lib/jdbcT4.jar ]]; then
+ if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build DCS from $DCS_SRC" | tee -a ${MY_LOG_FILE}
cd $DCS_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
@@@ -188,12 -188,12 +188,12 @@@ echo | tee -a ${MY_LOG_FILE
if [ -d rest-* ]; then
echo "REST files already exist, skipping REST setup"
else
- if [[ -f $REST_TAR ]]; then
- echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
+ if [[ -d $REST_BLD ]]; then
+ echo "Using REST Build: $REST_BLD" | tee -a ${MY_LOG_FILE}
elif [[ -d $REST_SRC ]]; then
- echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
- echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
+ echo "REST built target was not found in $REST_SRC" | tee -a ${MY_LOG_FILE}
+ echo "Building REST" | tee -a ${MY_LOG_FILE}
- if [[ -f $MY_SQROOT/export/lib/jdbcT4.jar ]]; then
+ if [[ -f $MY_SQROOT/export/lib/jdbcT4-${TRAFODION_VER}.jar ]]; then
echo "JDBCT4 jar file exist. Proceeding to build REST from $REST_SRC" | tee -a ${MY_LOG_FILE}
cd $REST_SRC
${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionalScanner.java.tmpl
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/60ef89d3/dcs/pom.xml
----------------------------------------------------------------------
[36/39] incubator-trafodion git commit: Merge [TRAFODION-1992]
Re-packaging server tar file broke install_traf_components
Posted by db...@apache.org.
Merge [TRAFODION-1992] Re-packaging server tar file broke install_traf_components
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6c7826c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6c7826c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6c7826c6
Branch: refs/heads/master
Commit: 6c7826c625e7f4f7eb958c81e7db5a0235c08ae3
Parents: 8feea90 55093a1
Author: Steve Varnau <st...@esgyn.com>
Authored: Tue May 17 23:35:06 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Tue May 17 23:35:06 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/install_traf_components | 50 +++++++++++------------
1 file changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[06/39] incubator-trafodion git commit: Merge [TRAFODION-1953] PR 454
Add jetty-security jar to REST server packaging
Posted by db...@apache.org.
Merge [TRAFODION-1953] PR 454 Add jetty-security jar to REST server packaging
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/29fb212d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/29fb212d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/29fb212d
Branch: refs/heads/master
Commit: 29fb212ddb52fb58a2d6d14087b80834a1eb19c3
Parents: ccafdcf 67d3e19
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Apr 29 15:40:59 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Apr 29 15:40:59 2016 +0000
----------------------------------------------------------------------
core/rest/pom.xml | 6 +++++-
core/rest/src/assembly/all.xml | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[18/39] incubator-trafodion git commit: [TRAFODION-1982] Combine
server components into single tar file
Posted by db...@apache.org.
[TRAFODION-1982] Combine server components into single tar file
Now bundle DCS and REST components into server binary tar file.
The license & notice file info for REST and DCS are subsumed into
server license files.
Fix naming of server and client tar files to meet Apache artifact
naming practices.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c8ef9645
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c8ef9645
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c8ef9645
Branch: refs/heads/master
Commit: c8ef96457e45441f4853a187237b4149d9058bd5
Parents: 7b5e5ea
Author: Steve Varnau <st...@esgyn.com>
Authored: Tue May 10 18:03:23 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Tue May 10 21:01:14 2016 +0000
----------------------------------------------------------------------
.gitignore | 1 +
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 34 +-
core/rest/src/assembly/all.xml | 10 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------------
licenses/lic-dcs-src | 69 --
licenses/lic-rest-bin | 1416 ---------------------------
licenses/lic-server-bin | 1834 +++++++++++++++++++++++++++++++++++
licenses/lic-server-src | 69 ++
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
20 files changed, 1965 insertions(+), 2305 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f09773f..bbe9199 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/distribution/
/licenses/LICENSE*
+/licenses/NOTICE*
LICENSE
/apache-*incubating/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index 99fdd5e..a0fde08 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -133,7 +133,7 @@ cleanall: sqroot eclipseclean cleantests
package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
-pkg-product: all
+pkg-product: all dcs rest
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
pkg-client: ci ndcs odb
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index a57bbb1..b2fa00b 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -25,9 +25,9 @@ include ../macros.gmk #top level
RM = /bin/rm
ifeq ($(SQ_BUILD_TYPE),release)
- CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/trafodion_clients-$(TRAFODION_VER).tgz
+ CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-incubating.tar.gz
else
- CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/trafodion_clients-$(TRAFODION_VER)-debug.tgz
+ CLIENT_TAR ?= ../../${DISTRIBUTION_DIR}/apache-trafodion_clients-$(TRAFODION_VER)-debug.tar.gz
endif
@@ -35,6 +35,7 @@ endif
all: pkg-clients
pkg-clients: clients/LICENSE clients/NOTICE
+ mkdir -p $$(dirname $(CLIENT_TAR))
tar -zcvf $(CLIENT_TAR) clients
clients/LICENSE: ../../licenses/LICENSE-clients
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 35cf9ab..46772c9 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -31,12 +31,10 @@ GENVERS =./genvers
all: build_all
-build_all: build_chk LICENSE NOTICE
+build_all: build_chk
echo "$(MAVEN) site package -DskipTests"
echo "### For full Maven output, see file build_rest.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- mkdir -p ../../${DISTRIBUTION_DIR}
- mv target/$(BLD_TRAFODION_REST_TARNAME) ../../${DISTRIBUTION_DIR}/
$(RM) $(VFILE)
build_chk:
@@ -47,16 +45,6 @@ build_chk:
clean:
-$(MAVEN) clean |grep ERROR
$(RM) build_rest.log
- $(RM) $(VFILE) LICENSE NOTICE
+ $(RM) $(VFILE)
$(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_REST_TARNAME)
-LICENSE: ../../licenses/LICENSE-rest
- cp -f $? $@
-
-../../licenses/LICENSE-rest:
- cd $(@D) && $(MAKE) $(@F)
-
-NOTICE: ../../NOTICE
- cp -f $? $@
- # Add notice file from jython 2.5.3
- cat ../../licenses/not-rest-bin >> $@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/rest/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index 5f7b478..b2c4432 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -76,36 +76,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <configuration>
- <target>
- <!-- Complements the assembly -->
-
- <mkdir dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}"/>
-
- <!-- Using Unix tar to preserve symlinks -->
- <echo file="${project.build.directory}/maketar.sh">
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
-
- cd $BUILD_DIR/${project.build.finalName}
- tar czf $BUILD_DIR/${project.build.finalName}.tar.gz ${project.build.finalName}
- </echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="yes">
- <arg line="./maketar.sh"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
@@ -130,15 +100,15 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/all.xml</descriptor>
</descriptors>
+ <ouputDirectory>target</ouputDirectory>
</configuration>
<executions>
<execution>
- <id>tarball</id>
+ <id>dir</id>
<phase>package</phase>
<goals>
<goal>single</goal>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/rest/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/assembly/all.xml b/core/rest/src/assembly/all.xml
index 461db05..dd37eaf 100644
--- a/core/rest/src/assembly/all.xml
+++ b/core/rest/src/assembly/all.xml
@@ -30,19 +30,11 @@ http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifi
-->
<id>all</id>
<formats>
- <format>tar.gz</format>
+ <format>dir</format>
</formats>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
- <fileMode>0644</fileMode>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>conf</directory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/sqf/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index 336976b..ebc26a9 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -67,3 +67,7 @@ Linux-x86_64/
# derived license
/LICENSE
/NOTICE
+
+# bundled component links
+/dcs-*
+/rest-*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 1a13269..f67ad46 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -260,18 +260,18 @@ genverhdr: buildinfo
-branch "${PV_BRANCH}" \
-date "${PV_DATE}"
-PKG_PROD = trafodion
+PKG_PROD = apache-trafodion
PKG_PHX = phoenix
PKG_DCS = dcs
ifeq ($(SQ_BUILD_TYPE),release)
- PKG_TYPE="server-$(TRAFODION_VER)"
+ PKG_TYPE="server-$(TRAFODION_VER)-incubating"
else
PKG_TYPE="server-$(TRAFODION_VER)-debug"
endif
PKG_BIN ?= "${PKG_PROD}.bin"
-PKG_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}_$(PKG_TYPE).tgz"
+PKG_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}_$(PKG_TYPE).tar.gz"
PKG_TAR_UN = "${PKG_PROD}_${SQ_BUILD_TYPE}.tar"
SRC_PKG_BIN ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-src.bin"
SRC_PKG_TAR ?= "../../${DISTRIBUTION_DIR}/${PKG_PROD}-src.tgz"
@@ -283,6 +283,7 @@ PKG_BIN_OBJS ?= export/bin$(SQ_MBTYPE) export/include export/lib export/lib$(SQ_
PKG_BIN_OBJS += trafci
PKG_BIN_OBJS += export/limited-support-tools
PKG_BIN_OBJS += LICENSE NOTICE
+PKG_BIN_OBJS += rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
PKG_BIN_DIRS ?= sql export
PKG_BIN_DIRS += trafci
@@ -315,9 +316,18 @@ LICENSE: ../../licenses/LICENSE-server
../../licenses/LICENSE-server:
cd $(@D) && $(MAKE) $(@F)
-NOTICE: ../../NOTICE
+NOTICE: ../../licenses/NOTICE-server
cp -f $? $@
+../../licenses/NOTICE-server:
+ cd $(@D) && $(MAKE) $(@F)
+
+rest-${TRAFODION_VER}:
+ ln -s ../rest/target/$@/$@ $@
+
+dcs-${TRAFODION_VER}:
+ ln -s ../../dcs/target/$@/$@ $@
+
tmp/sqenv.sh:
@if [ ! -d tmp ]; then mkdir tmp; fi
echo "export SQ_BUILD_TYPE=$(SQ_BUILD_TYPE)" > tmp/sqenv.sh
@@ -330,7 +340,7 @@ pkglist-files: pkglist-symlinks
find -L $(PKG_BIN_OBJS) -type d -o -type f | grep -v -xf pkglist-symlinks > $@
# simple symlinks that point to filename (does not start with . or /)
-pkglist-symlinks: LICENSE NOTICE
+pkglist-symlinks: LICENSE NOTICE rest-${TRAFODION_VER} dcs-${TRAFODION_VER}
find $(PKG_BIN_OBJS) -lname '[^./]*' > $@
# Targets to tar/gzip the self installer
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index 9245415..93398ea 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -31,12 +31,10 @@ GENVERS =./genvers
all: build_all
-build_all: build_chk LICENSE NOTICE
+build_all: build_chk
echo "$(MAVEN) site package -DskipTests"
echo "### For full Maven output, see file build_dcs.log"
set -o pipefail && $(MAVEN) site package -DskipTests | tee build_dcs.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- mkdir -p ../${DISTRIBUTION_DIR}
- mv target/$(BLD_TRAFODION_DCS_TARNAME) ../${DISTRIBUTION_DIR}
$(RM) $(VFILE)
build_chk:
@@ -44,19 +42,8 @@ build_chk:
@if [ $(GENVERS) -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
@if [ $(MY_SQROOT)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_DCS_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_DCS_TARNAME); fi
-LICENSE: ../licenses/LICENSE-dcs
- cp -f $? $@
-
-../licenses/LICENSE-dcs:
- cd $(@D) && $(MAKE) $(@F)
-
-NOTICE: ../NOTICE
- cp -f $? $@
- # Add notice file from jython 2.5.3
- cat ../licenses/not-dcs-bin >> $@
-
clean:
-$(MAVEN) clean | grep ERROR
$(RM) build_dcs.log
- $(RM) $(VFILE) LICENSE NOTICE
+ $(RM) $(VFILE)
$(RM) ../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/dcs/pom.xml
----------------------------------------------------------------------
diff --git a/dcs/pom.xml b/dcs/pom.xml
index e9b6d11..9fd2e08 100644
--- a/dcs/pom.xml
+++ b/dcs/pom.xml
@@ -191,36 +191,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <configuration>
- <target>
- <!-- Complements the assembly -->
-
- <mkdir dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}"/>
-
- <!-- Using Unix tar to preserve symlinks -->
- <echo file="${project.build.directory}/maketar.sh">
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
-
- cd $BUILD_DIR/${project.build.finalName}
- tar czf $BUILD_DIR/${project.build.finalName}.tar.gz ${project.build.finalName}
- </echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="yes">
- <arg line="./maketar.sh"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
<plugin>
@@ -260,19 +230,19 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly.plugin.version}</version>
<configuration>
- <tarLongFileMode>posix</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/all.xml</descriptor>
</descriptors>
+ <ouputDirectory>target</ouputDirectory>
</configuration>
<executions>
<execution>
- <id>tarball</id>
+ <id>dir</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -530,7 +500,7 @@
<asciidoctor.maven.plugin.version>1.5.2</asciidoctor.maven.plugin.version>
<maven.project.info.reports.plugin.version>2.1.2</maven.project.info.reports.plugin.version>
<build.helper.maven.plugin.version>1.5</build.helper.maven.plugin.version>
- <maven.assembly.plugin.version>2.5.3</maven.assembly.plugin.version>
+ <maven.assembly.plugin.version>2.6</maven.assembly.plugin.version>
<package.version>${project.version}</package.version>
<final.name>${project.artifactId}-${project.version}</final.name>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/dcs/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/dcs/src/assembly/all.xml b/dcs/src/assembly/all.xml
index d4843d2..fbd5dd3 100644
--- a/dcs/src/assembly/all.xml
+++ b/dcs/src/assembly/all.xml
@@ -30,17 +30,11 @@
-->
<id>all</id>
<formats>
- <format>tar.gz</format>
+ <format>dir</format>
</formats>
<fileSets>
<fileSet>
- <includes>
- <include>${project.basedir}/NOTICE</include>
- <include>${project.basedir}/LICENSE</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>conf</directory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index 597c080..92b449f 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -19,28 +19,25 @@
#
# @@@ END COPYRIGHT @@@
-all: LICENSE-src LICENSE-dcs LICENSE-server LICENSE-install LICENSE-rest LICENSE-clients
+all: LICENSE-src LICENSE-server LICENSE-install LICENSE-clients NOTICE-server
# All source code included in Trafodion source
LICENSE-src:
- cat Apache lic-components-src lic-dcs-src lic-server-src lic-test-src > $@
+ cat Apache lic-components-src lic-server-src lic-test-src > $@
# Binary licenses for each separately packaged component
# Must include source licenses as well as software bundled in at build time
-LICENSE-dcs:
- cat Apache lic-dcs-src lic-dcs-bin > $@
-
LICENSE-server:
cat Apache lic-server-src lic-server-bin > $@
+NOTICE-server:
+ cat ../NOTICE note-server-bin > $@
+
LICENSE-install:
cat Apache > $@
-LICENSE-rest:
- cat Apache lic-rest-bin > $@
-
LICENSE-clients:
cat Apache lic-clients-bin > $@
clean:
- rm LICENSE*
+ rm -f LICENSE* NOTICE*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/lic-dcs-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-dcs-bin b/licenses/lic-dcs-bin
deleted file mode 100644
index 96a489d..0000000
--- a/licenses/lic-dcs-bin
+++ /dev/null
@@ -1,652 +0,0 @@
-===============================================================================
-The binary distribution of Apache Trafodion DCS bundles Jetty software which is
-available under the Apache License Version 2.0 (ALv2), though developed outside
-of the ASF. The bundled software includes Jetty Server, Jetty Utilities, and
-Glassfish Jasper API (JSP2.1 API). http://www.eclipse.org/jetty/
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion DCS bundles SLF4J (Simple Logging
-Facade for Java) software which is available under the MIT/X11 License.
-http://www.slf4j.org
-
- Copyright (c) 2004-2013 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.
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion DCS bundles Display Tag Library
-software which is available under the Artistic License.
-http://displaytag.sf.net
-
- The Artistic License
-
- Preamble
-
- The intent of this document is to state the conditions under which a
- Package may be copied, such that the Copyright Holder maintains some
- semblance of artistic control over the development of the package,
- while giving the users of the package the right to use and distribute
- the Package in a more-or-less customary fashion, plus the right to make
- reasonable modifications.
-
- "Package" refers to the collection of files distributed by the
- Copyright Holder, and derivatives of that collection of files
- created through textual modification.
-
- "Standard Version" refers to such a Package if it has not been
- modified, or has been modified in accordance with the wishes
- of the Copyright Holder.
-
- "Copyright Holder" is whoever is named in the copyright or
- copyrights for the package.
-
- "You" is you, if you're thinking about copying or distributing
- this Package.
-
- "Reasonable copying fee" is whatever you can justify on the
- basis of media cost, duplication charges, time of people involved,
- and so on. (You will not be required to justify it to the
- Copyright Holder, but only to the computing community at large
- as a market that must bear the fee.)
-
- "Freely Available" means that no fee is charged for the item
- itself, though there may be fees involved in handling the item.
- It also means that recipients of the item may redistribute it
- under the same conditions they received it.
-
-
- 1. You may make and give away verbatim copies of the source form of the
- Standard Version of this Package without restriction, provided that you
- duplicate all of the original copyright notices and associated disclaimers.
-
-
- 2. You may apply bug fixes, portability fixes and other modifications
- derived from the Public Domain or from the Copyright Holder. A Package
- modified in such a way shall still be considered the Standard Version.
-
-
- 3. You may otherwise modify your copy of this Package in any way, provided
- that you insert a prominent notice in each changed file stating how and
- when you changed that file, and provided that you do at least ONE of the
- following:
-
- a) place your modifications in the Public Domain or otherwise make them
- Freely Available, such as by posting said modifications to Usenet or
- an equivalent medium, or placing the modifications on a major archive
- site such as ftp.uu.net, or by allowing the Copyright Holder to include
- your modifications in the Standard Version of the Package.
-
- b) use the modified Package only within your corporation or organization.
-
- c) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided, and provide
- a separate manual page for each non-standard executable that clearly
- documents how it differs from the Standard Version.
-
- d) make other distribution arrangements with the Copyright Holder.
-
-
- 4. You may distribute the programs of this Package in object code or
- executable form, provided that you do at least ONE of the following:
-
- a) distribute a Standard Version of the executables and library files,
- together with instructions (in the manual page or equivalent) on where
- to get the Standard Version.
-
- b) accompany the distribution with the machine-readable source of
- the Package with your modifications.
-
- c) accompany any non-standard executables with their corresponding
- Standard Version executables, giving the non-standard executables
- non-standard names, and clearly documenting the differences in manual
- pages (or equivalent), together with instructions on where to get
- the Standard Version.
-
- d) make other distribution arrangements with the Copyright Holder.
-
-
- 5. You may charge a reasonable copying fee for any distribution of this
- Package. You may charge any fee you choose for support of this Package.
- You may not charge a fee for this Package itself. However,
- you may distribute this Package in aggregate with other (possibly
- commercial) programs as part of a larger (possibly commercial) software
- distribution provided that you do not advertise this Package as a
- product of your own.
-
-
- 6. The scripts and library files supplied as input to or produced as
- output from the programs of this Package do not automatically fall
- under the copyright of this Package, but belong to whomever generated
- them, and may be sold commercially, and may be aggregated with this
- Package.
-
-
- 7. C or perl subroutines supplied by you and linked into this Package
- shall not be considered part of this Package.
-
-
- 8. The name of the Copyright Holder may not be used to endorse or promote
- products derived from this software without specific prior written permission.
-
-
- 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-
- The End
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion DCS bundles Jython Standalone
-software which is available under the Python Software License.
-http://www.jython.org
-
- ====================================
- The Jython License
- ====================================
-
-
- A. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING JYTHON
- ==============================================================================================================
-
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- ----------------------------------------------------------------------------------------
-
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Jython") in source or binary form and
- its associated documentation.
-
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Jython alone
- or in any derivative version, provided, however, that PSF's License
- Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2007
- Python Software Foundation; All Rights Reserved" are retained in
- Jython alone or in any derivative version prepared by Licensee.
-
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Jython or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Jython.
-
- 4. PSF is making Jython available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF JYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
-
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF JYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING JYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
-
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
-
- 8. By copying, installing or otherwise using Jython, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
-
- Jython 2.0, 2.1 License
- --------------------------------------------
-
- Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
- 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 Jython Developers 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 REGENTS 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.
-
-
-
-
- JPython 1.1.x Software License.
- ______________________________________________________________________
-
- 1. This LICENSE AGREEMENT is between the Corporation for National Research
- Initiatives, having an office at 1895 Preston White Drive, Reston, VA
- 20191 ("CNRI"), and the Individual or Organization ("Licensee")
- accessing and using JPython version 1.1.x in source or binary form and
- its associated documentation as provided herein ("Software").
-
- 2. Subject to the terms and conditions of this License Agreement, CNRI
- hereby grants Licensee a non-exclusive, non-transferable, royalty-free,
- world-wide license to reproduce, analyze, test, perform and/or display
- publicly, prepare derivative works, distribute, and otherwise use the
- Software alone or in any derivative version, provided, however, that
- CNRI's License Agreement and CNRI's notice of copyright, i.e.,
- "Copyright �1996-1999 Corporation for National Research Initiatives;
- All Rights Reserved" are both retained in the Software, alone or in any
- derivative version prepared by Licensee.
-
- Alternatively, in lieu of CNRI's License Agreement, Licensee may
- substitute the following text (omitting the quotes), provided, however,
- that such text is displayed prominently in the Software alone or in any
- derivative version prepared by Licensee: "JPython (Version 1.1.x) is
- made available subject to the terms and conditions in CNRI's License
- Agreement. This Agreement may be located on the Internet using the
- following unique, persistent identifier (known as a handle):
- 1895.22/1006. The License may also be obtained from a proxy server on
- the Web using the following URL: http://hdl.handle.net/1895.22/1006."
-
- 3. In the event Licensee prepares a derivative work that is based on or
- incorporates the Software or any part thereof, and wants to make the
- derivative work available to the public as provided herein, then
- Licensee hereby agrees to indicate in any such work, in a prominently
- visible way, the nature of the modifications made to CNRI's Software.
-
- 4. Licensee may not use CNRI trademarks or trade name, including JPython
- or CNRI, in a trademark sense to endorse or promote products or
- services of Licensee, or any third party. Licensee may use the mark
- JPython in connection with Licensee's derivative versions that are
- based on or incorporate the Software, but only in the form
- "JPython-based ___________________," or equivalent.
-
- 5. CNRI is making the Software available to Licensee on an "AS IS" basis.
- CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY
- OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY
- REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
- PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT INFRINGE
- ANY THIRD PARTY RIGHTS.
-
- 6. CNRI SHALL NOT BE LIABLE TO LICENSEE OR OTHER USERS OF THE SOFTWARE FOR
- ANY INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
- USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE
- THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. SOME STATES DO NOT
- ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY SO THE ABOVE DISCLAIMER
- MAY NOT APPLY TO LICENSEE.
-
- 7. This License Agreement may be terminated by CNRI (i) immediately upon
- written notice from CNRI of any material breach by the Licensee, if the
- nature of the breach is such that it cannot be promptly remedied; or
- (ii) sixty (60) days following notice from CNRI to Licensee of a
- material remediable breach, if Licensee has not remedied such breach
- within that sixty-day period.
-
- 8. This License Agreement shall be governed by and interpreted in all
- respects by the law of the State of Virginia, excluding conflict of law
- provisions. Nothing in this Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between CNRI and
- Licensee.
-
- 9. By clicking on the "ACCEPT" button where indicated, or by installing,
- copying or otherwise using the Software, Licensee agrees to be bound by
- the terms and conditions of this License Agreement.
-
- [ACCEPT BUTTON]
-
- B. HISTORY OF THE SOFTWARE
- =======================================================
-
- JPython was created in late 1997 by Jim Hugunin. Jim was also the
- primary developer while he was at CNRI. In February 1999 Barry Warsaw
- took over as primary developer and released JPython version 1.1.
-
- In October 2000 Barry helped move the software to SourceForge
- where it was renamed to Jython. Jython 2.0 and 2.1 were developed
- under the Jython specific license below.
-
- From the 2.2 release on, Jython contributors have signed
- Python Software Foundation contributor agreements and releases are
- covered under the Python Software Foundation license version 2.
-
- The standard library is covered by the Python Software Foundation
- license as well. See the Lib/LICENSE file for details.
-
- The zxJDBC package was written by Brian Zimmer and originally licensed
- under the GNU Public License. The package is now covered by the Jython
- Software License.
-
- The command line interpreter is covered by the Apache Software
- License. See the org/apache/LICENSE file for details.
-
-+++++++++++++++++++++++++++++
-
-The binary distribution of Apache Trafodion DCS bundles Glassfish Jasper 2.1
-and Servlet Specification 2.5 API software which is available under the
-CDDL License.
-https://glassfish.dev.java.net
-https://glassfish.dev.java.net/public/CDDLv1.0.html
-
- COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 1.
-
- Definitions.
-
- 1.1. Contributor means each individual or entity that creates or contributes
- to the creation of Modifications.
-
- 1.2. Contributor Version means the combination of the Original Software,
- prior Modifications used by a Contributor (if any), and the Modifications made
- by that particular Contributor.
-
- 1.3. Covered Software means (a) the Original Software, or (b) Modifications,
- or (c) the combination of files containing Original Software with files
- containing Modifications, in each case including portions thereof.
-
- 1.4. Executable means the Covered Software in any form other than Source Code.
-
- 1.5. Initial Developer means the individual or entity that first makes
- Original Software available under this License.
-
- 1.6. Larger Work means a work which combines Covered Software or portions
- thereof with code not governed by the terms of this License.
-
- 1.7. License means this document.
-
- 1.8. Licensable means having the right to grant, to the maximum extent
- possible, whether at the time of the initial grant or subsequently acquired,
- any and all of the rights conveyed herein.
-
- 1.9. Modifications means the Source Code and Executable form of any of the
- following: A. Any file that results from an addition to, deletion from or
- modification of the contents of a file containing Original Software or previous
- Modifications; B. Any new file that contains any part of the Original Software
- or previous Modification; or C. Any new file that is contributed or otherwise
- made available under the terms of this License.
-
- 1.10. Original Software means the Source Code and Executable form of computer
- software code that is originally released under this License.
-
- 1.11. Patent Claims means any patent claim(s), now owned or hereafter
- acquired, including without limitation, method, process, and apparatus claims,
- in any patent Licensable by grantor.
-
- 1.12. Source Code means (a) the common form of computer software code in
- which modifications are made and (b) associated documentation included in or
- with such code.
-
- 1.13. You (or Your) means an individual or a legal entity exercising rights
- under, and complying with all of the terms of, this License. For legal
- entities, You includes any entity which controls, is controlled by, or is under
- common control with You. For purposes of this definition, control means (a) the
- power, direct or indirect, to cause the direction or management of such entity,
- whether by contract or otherwise, or (b) ownership of more than fifty percent
- (50%) of the outstanding shares or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant. Conditioned upon Your compliance with
- Section 3.1 below and subject to third party intellectual property claims, the
- Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
- license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Initial Developer, to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or portions thereof), with or
- without Modifications, and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of Original
- Software, to make, have made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or portions thereof);
-
- (c) The licenses granted in Sections 2.1(a) and (b) are effective on the
- date Initial Developer first distributes or otherwise makes the Original
- Software available to a third party under the terms of this License;
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1)
- for code that You delete from the Original Software, or (2) for infringements
- caused by: (i) the modification of the Original Software, or (ii) the
- combination of the Original Software with other software or devices.
-
- 2.2. Contributor Grant. Conditioned upon Your compliance with Section 3.1
- below and subject to third party intellectual property claims, each Contributor
- hereby grants You a world-wide, royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than patent or trademark)
- Licensable by Contributor to use, reproduce, modify, display, perform,
- sublicense and distribute the Modifications created by such Contributor (or
- portions thereof), either on an unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in combination with
- its Contributor Version (or portions of such combination), to make, use, sell,
- offer for sale, have made, and/or otherwise dispose of: (1) Modifications made
- by that Contributor (or portions thereof); and (2) the combination of
- Modifications made by that Contributor with its Contributor Version (or
- portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the
- date Contributor first distributes or otherwise makes the Modifications
- available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1)
- for any code that Contributor has deleted from the Contributor Version; (2) for
- infringements caused by: (i) third party modifications of Contributor Version,
- or (ii) the combination of Modifications made by that Contributor with other
- software (except as part of the Contributor Version) or other devices; or (3)
- under Patent Claims infringed by Covered Software in the absence of
- Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code. Any Covered Software that You distribute or
- otherwise make available in Executable form must also be made available in
- Source Code form and that Source Code form must be distributed only under the
- terms of this License. You must include a copy of this License with every copy
- of the Source Code form of the Covered Software You distribute or otherwise
- make available. You must inform recipients of any such Covered Software in
- Executable form as to how they can obtain such Covered Software in Source Code
- form in a reasonable manner on or through a medium customarily used for
- software exchange.
-
- 3.2. Modifications. The Modifications that You create or to which You
- contribute are governed by the terms of this License. You represent that You
- believe Your Modifications are Your original creation(s) and/or You have
- sufficient rights to grant the rights conveyed by this License.
-
- 3.3. Required Notices. You must include a notice in each of Your
- Modifications that identifies You as the Contributor of the Modification. You
- may not remove or alter any copyright, patent or trademark notices contained
- within the Covered Software, or any notices of licensing or any descriptive
- text giving attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms. You may not offer or impose any terms
- on any Covered Software in Source Code form that alters or restricts the
- applicable version of this License or the recipients rights hereunder. You may
- choose to offer, and to charge a fee for, warranty, support, indemnity or
- liability obligations to one or more recipients of Covered Software. However,
- you may do so only on Your own behalf, and not on behalf of the Initial
- Developer or any Contributor. You must make it absolutely clear that any such
- warranty, support, indemnity or liability obligation is offered by You alone,
- and You hereby agree to indemnify the Initial Developer and every Contributor
- for any liability incurred by the Initial Developer or such Contributor as a
- result of warranty, support, indemnity or liability terms You offer.
-
- 3.5. Distribution of Executable Versions. You may distribute the Executable
- form of the Covered Software under the terms of this License or under the terms
- of a license of Your choice, which may contain terms different from this
- License, provided that You are in compliance with the terms of this License and
- that the license for the Executable form does not attempt to limit or alter the
- recipients rights in the Source Code form from the rights set forth in this
- License. If You distribute the Covered Software in Executable form under a
- different license, You must make it absolutely clear that any terms which
- differ from this License are offered by You alone, not by the Initial Developer
- or Contributor. You hereby agree to indemnify the Initial Developer and every
- Contributor for any liability incurred by the Initial Developer or such
- Contributor as a result of any such terms You offer.
-
- 3.6. Larger Works. You may create a Larger Work by combining Covered Software
- with other code not governed by the terms of this License and distribute the
- Larger Work as a single product. In such a case, You must make sure the
- requirements of this License are fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions. Sun Microsystems, Inc. is the initial license steward and
- may publish revised and/or new versions of this License from time to time. Each
- version will be given a distinguishing version number. Except as provided in
- Section 4.3, no one other than the license steward has the right to modify this
- License.
-
- 4.2. Effect of New Versions. You may always continue to use, distribute or
- otherwise make the Covered Software available under the terms of the version of
- the License under which You originally received the Covered Software. If the
- Initial Developer includes a notice in the Original Software prohibiting it
- from being distributed or otherwise made available under any subsequent version
- of the License, You must distribute and make the Covered Software available
- under the terms of the version of the License under which You originally
- received the Covered Software. Otherwise, You may also choose to use,
- distribute or otherwise make the Covered Software available under the terms of
- any subsequent version of the License published by the license steward.
-
- 4.3. Modified Versions. When You are an Initial Developer and You want to
- create a new license for Your Original Software, You may create and use a
- modified version of this License if You: (a) rename the license and remove any
- references to the name of the license steward (except to note that the license
- differs from this License); and (b) otherwise make it clear that the license
- contains terms which differ from this License.
-
- 5. DISCLAIMER OF WARRANTY. COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON
- AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF
- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE
- ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH
- YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
- INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
- SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
- ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
- HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure such
- breach within 30 days of becoming aware of the breach. Provisions which, by
- their nature, must remain in effect beyond the termination of this License
- shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding declaratory
- judgment actions) against Initial Developer or a Contributor (the Initial
- Developer or Contributor against whom You assert such claim is referred to as
- Participant) alleging that the Participant Software (meaning the Contributor
- Version where the Participant is a Contributor or the Original Software where
- the Participant is the Initial Developer) directly or indirectly infringes any
- patent, then any and all rights granted directly or indirectly to You by such
- Participant, the Initial Developer (if the Initial Developer is not the
- Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License
- shall, upon 60 days notice from Participant terminate prospectively and
- automatically at the expiration of such 60 day notice period, unless if within
- such 60 day period You withdraw Your claim with respect to the Participant
- Software against such Participant either unilaterally or pursuant to a written
- agreement with Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2 above, all end
- user licenses that have been validly granted by You or any distributor
- hereunder prior to termination (excluding licenses granted to You by any
- distributor) shall survive termination.
-
- 7. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
- WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
- INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED
- SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
- ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER
- INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
- STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL
- DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
- POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO
- LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO
- THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT
- ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
- THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS. The Covered Software is a commercial item, as
- that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of commercial
- computer software (as that term is defined at 48 C.F.R. 252.227-7014(a)(1))
- and commercial computer software documentation as such terms are used in 48
- C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R.
- 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users
- acquire Covered Software with only those rights set forth herein. This U.S.
- Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or
- other clause or provision that addresses Government rights in computer software
- under this License.
-
- 9. MISCELLANEOUS. This License represents the complete agreement concerning
- subject matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent necessary to
- make it enforceable. This License shall be governed by the law of the
- jurisdiction specified in a notice contained within the Original Software
- (except to the extent applicable law, if any, provides otherwise), excluding
- such jurisdictions conflict-of-law provisions. Any litigation relating to this
- License shall be subject to the jurisdiction of the courts located in the
- jurisdiction and venue specified in a notice contained within the Original
- Software, with the losing party responsible for costs, including, without
- limitation, court costs and reasonable attorneys fees and expenses. The
- application of the United Nations Convention on Contracts for the International
- Sale of Goods is expressly excluded. Any law or regulation which provides that
- the language of a contract shall be construed against the drafter shall not
- apply to this License. You agree that You alone are responsible for compliance
- with the United States export administration regulations (and the export
- control laws and regulation of any other countries) when You use, distribute or
- otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the
- Contributors, each party is responsible for claims and damages arising,
- directly or indirectly, out of its utilization of rights under this License and
- You agree to work with Initial Developer and Contributors to distribute such
- responsibility on an equitable basis. Nothing herein is intended or shall be
- deemed to constitute any admission of liability.
-
- NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
- LICENSE (CDDL) The code released under the CDDL shall be governed by the laws
- of the State of California (excluding conflict-of-law provisions). Any
- litigation relating to this License shall be subject to the jurisdiction of the
- Federal Courts of the Northern District of California and the state courts of
- the State of California, with venue lying in Santa Clara County, California.
-
-+++++++++++++++++++++++++++++
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c8ef9645/licenses/lic-dcs-src
----------------------------------------------------------------------
diff --git a/licenses/lic-dcs-src b/licenses/lic-dcs-src
deleted file mode 100644
index 8db2d9a..0000000
--- a/licenses/lic-dcs-src
+++ /dev/null
@@ -1,69 +0,0 @@
-===============================================================================
-The DCS subcomponent of Apache Trafodion bundles source with BSD-like and
-MIT-like licenses:
-
-+++++++++++++++++++++++++++++
-
-BSD-3 clause for files in:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables
-
- Copyright 2009 Allan Jardine. All Rights Reserved
- Copyright 2008-2012 Allan Jardine, all rights reserved.
-
-For details see:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt
-
-+++++++++++++++++++++++++++++
-
-MIT-Expat for files in:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js
-
- Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/)
- Copyright (c) 2006-2010 Valerio Proietti
-
- 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.
-
-+++++++++++++++++++++++++++++
-
-MIT-Expat for files in:
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
- incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
-
- Copyright 2014 jQuery Foundation and other contributors
- (c) 2005, 2014 jQuery Foundation, Inc.
-
- 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.
-
-++++++++++++++++++++++++++++++
-
[21/39] incubator-trafodion git commit: Merge remote branch
'amanda/TRAFODION-1985' into pkg1982
Posted by db...@apache.org.
Merge remote branch 'amanda/TRAFODION-1985' into pkg1982
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c861ea9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c861ea9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c861ea9e
Branch: refs/heads/master
Commit: c861ea9e8f34a48056d74ee28a87791168af9c3f
Parents: c8ef964 10adf4b
Author: Steve Varnau <st...@esgyn.com>
Authored: Tue May 10 23:00:52 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Tue May 10 23:02:20 2016 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 17 +--
install/installer/rest_installer | 18 +--
install/installer/traf_apache_mods | 2 +-
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +++++-----
install/installer/traf_config_check | 38 ++++--
install/installer/traf_config_setup | 69 ++---------
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
install/installer/trafodion_config_default | 14 +--
install/installer/trafodion_install | 148 +++++++-----------------
11 files changed, 139 insertions(+), 237 deletions(-)
----------------------------------------------------------------------
[31/39] incubator-trafodion git commit: Typo
Posted by db...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/15fbc0ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/15fbc0ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/15fbc0ba
Branch: refs/heads/master
Commit: 15fbc0ba54d8fc000d1ab5fc77c151df8911e608
Parents: 1e1dca8
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 20:45:54 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 20:45:54 2016 +0000
----------------------------------------------------------------------
install/installer/rest_installer | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/15fbc0ba/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index ece48a0..ae89807 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -95,7 +95,7 @@ cd $REST_INSTALL_PATH
if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
- REST_DIR=$($SQ_ROOT/$REST_DIR)
+ REST_DIR=$SQ_ROOT/$REST_DIR
echo "***INFO: Rest Install Directory: $REST_DIR"
else
[39/39] incubator-trafodion git commit: Merge [TRAFODION-1977] PR 493
Merge latest release2.0 into master
Posted by db...@apache.org.
Merge [TRAFODION-1977] PR 493 Merge latest release2.0 into master
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c8305589
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c8305589
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c8305589
Branch: refs/heads/master
Commit: c8305589885784c2a45bfdc7eae744423bd4f1fe
Parents: 39ae473 60ef89d
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 25 20:33:09 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 25 20:33:09 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/rest/Makefile | 16 +-
core/rest/pom.xml | 40 +-
core/rest/src/assembly/all.xml | 11 +-
core/sqf/.gitignore | 4 +
core/sqf/Makefile | 20 +-
core/sqf/sql/scripts/install_traf_components | 50 +-
.../TransactionalScanner.java.tmpl | 2 +-
.../transactional/SplitBalanceHelper.java | 51 +-
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
.../java/org/trafodion/sql/HTableClient.java | 5 +-
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
dcs/src/assembly/all.xml | 8 +-
install/installer/dcs_installer | 19 +-
install/installer/rest_installer | 21 +-
.../installer/traf_apache_hadoop_config_setup | 842 --------
install/installer/traf_cloudera_mods | 2 +-
install/installer/traf_config | 62 +-
install/installer/traf_config_check | 44 +-
install/installer/traf_config_setup | 69 +-
install/installer/traf_hortonworks_mods | 4 +-
install/installer/traf_package_setup | 2 +
.../installer/trafodion_apache_hadoop_install | 763 --------
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
install/traf_tools_setup.sh | 1 +
licenses/Makefile | 15 +-
licenses/lic-dcs-bin | 652 -------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 --------------
licenses/lic-server-bin | 1834 ++++++++++++++++++
licenses/lic-server-src | 69 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
43 files changed, 2207 insertions(+), 4186 deletions(-)
----------------------------------------------------------------------
[23/39] incubator-trafodion git commit: Adding cat of config file for
installation debugging
Posted by db...@apache.org.
Adding cat of config file for installation debugging
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/28f51144
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/28f51144
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/28f51144
Branch: refs/heads/master
Commit: 28f51144bdd6d5af68db41a26675e2df32f9500e
Parents: 10adf4b
Author: Amanda Moran <am...@apache.com>
Authored: Wed May 11 13:26:28 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed May 11 13:26:28 2016 +0000
----------------------------------------------------------------------
install/installer/traf_config_check | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/28f51144/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index dd883f0..5ed0b44 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -33,6 +33,7 @@ source $TRAF_CONFIG
function majorErrorFound {
if [[ "$errorFound" == "1" ]]; then
cat $ERROR_LOG
+ cat /etc/trafodion/trafodion_config
echo
exit -1
fi