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/02/22 17:52:10 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1835] Re-factor
license files
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 766c62ea0 -> 611b5563d
[TRAFODION-1835] Re-factor license files
Enable building license files for source and binary distributions.
Since we build several different distribution packages, the LICENSE
files need to be specific to the components packaged.
The licenses/Makefile indicates how we combine each component source
and binary license files for source package and the various binary
distribution packages.
Binary distribution license info is still incomplete. This change
sets the framework, and license content will be completed later.
Several of the licenses/*-bin files have "To Do" items indicating
remaining work to be done related to TRAFODION-1816.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d6830446
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d6830446
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d6830446
Branch: refs/heads/master
Commit: d6830446562ffafbea4e9fc4c8542f4e2fdee39f
Parents: 0918828
Author: Steve Varnau <st...@esgyn.com>
Authored: Thu Feb 18 02:23:09 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Thu Feb 18 23:32:54 2016 +0000
----------------------------------------------------------------------
.gitattributes | 3 -
.gitignore | 3 +
.rat-excludes | 6 +-
LICENSE | 305 ------------------------------------
Makefile | 13 +-
NOTICE | 2 +-
README | 8 +-
core/conn/Makefile | 12 +-
core/rest/.gitignore | 2 +
core/rest/Makefile | 13 +-
core/rest/src/assembly/all.xml | 8 +
core/sqf/.gitignore | 3 +
core/sqf/Makefile | 12 +-
dcs/.gitignore | 2 +
dcs/Makefile | 14 +-
dcs/src/assembly/all.xml | 4 +-
install/.gitignore | 2 +
install/Makefile | 11 +-
licenses/Apache | 203 ++++++++++++++++++++++++
licenses/LICENSE-bsd3 | 14 --
licenses/LICENSE-bsd4 | 34 ----
licenses/LICENSE-facebook | 14 --
licenses/LICENSE-jquery | 8 -
licenses/LICENSE-js | 21 ---
licenses/LICENSE-salesforce | 23 ---
licenses/Makefile | 46 ++++++
licenses/lic-clients-bin | 25 +++
licenses/lic-components-src | 9 ++
licenses/lic-dcs-bin | 9 ++
licenses/lic-dcs-src | 69 ++++++++
licenses/lic-rest-bin | 9 ++
licenses/lic-server-bin | 135 ++++++++++++++++
licenses/lic-server-src | 76 +++++++++
licenses/lic-test-src | 43 +++++
34 files changed, 718 insertions(+), 443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 25ec901..4342c5c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,3 @@ docs/command_interface export-ignore
docs/odb_manual export-ignore
docs/sql_reference export-ignore
docs/src/site export-ignore
-# used for Compiler GUI which we don't support yet
-core/sqf/export/limited-support-tools/QPDrawer
-core/sql/SqlCompilerDebugger/Resource.qrc
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8508a5c..f09773f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
/distribution/
+/licenses/LICENSE*
+LICENSE
+/apache-*incubating/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 7406da7..1073071 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -57,10 +57,8 @@ Sortingicons.psd*
# licenses
license*.txt*
LICENSE.rtf*
-LICENSE-bsd3
-LICENSE-bsd4
-LICENSE-js
-LICENSE-salesforce
+lic-.*-src
+lic-.*-bin
# win generated
SetCertificateDirReg_os.vcxproj*
SetCertificateDirReg_os.vcxproj.*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 5a89653..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,305 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-===============================================================================
-===============================================================================
-
-APACHE TRAFODION SUBCOMPONENTS:
-
-Apache Trafodion includes a number of subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following licenses.
-
-===============================================================================
-Apache Trafodion uses several BSD like licenses:
-
-BSD-4 for files:
- incubator-trafodion/core/sql/common/swsprintf.cpp
- incubator-trafodion/core/sql/common/swscanf.cpp
-
- Copyright (c) 1990 The Regents of the University of California.
- Copyright (c) 1990, 1993 The Regents of the University of California.
- This code is derived from software contributed to Berkeley by Chris Torek.
-
-For details see incubator-trafodion/licenses/LICENSE-bsd4
-
-+++++++++++++++++++++++++++++
-
-BSD-3 for file incubator-trafodion/core/sql/parser/ulexer.h
-
- Copyright (c) 1993 The Regents of the University of California.
-
-For details see incubator-trafodion/licenses/LICENSE-bsd3
-
-+++++++++++++++++++++++++++++
-
-BSD-3 for files in:
- incubator-trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
-
-Apache Trafodion changed these files to work within its test environment
-
- Copyright (c) 2013, Salesforce.com, Inc.
-
-For details see incubator-trafodion/licenses/LICENSE-salesforce
-
-+++++++++++++++++++++++++++++
-
-BSD-3 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
-
-===============================================================================
-Apache Trafodion uses several MIT like licenses:
-
-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
-
-For details see incubator-trafodion/licenses/LICENSE-js
-
-+++++++++++++++++++++++++++++
-
-MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
-
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
- Copyright 2000, Clark Cooper
-
-For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING
-
-+++++++++++++++++++++++++++++
-
-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.
-
-For details see incubator-trafodion/licenses/LICENSE-jquery
-
-++++++++++++++++++++++++++++++
-
-===============================================================================
-As part of test large objects (LOBs), the testware needs some object files.
-Two pictures were donated for this purpose by Christophe LeRouzo. He has
-formally given Apache Trafodion to permission to use these picturs.
-
-incubator-trafodion/core/sql/regress/executor/anoush.jpg
-incubator-trafodion/core/sql/regress/executor/deep.jpg
-
-===============================================================================
-===============================================================================
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 9e80e30..7258f30 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,17 @@ package-all:
@echo "Packaging all Trafodion components"
cd core && $(MAKE) package-all
-package-src:
+package-src: $(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE
@echo "Packaging source for $(TRAFODION_VER_PROD) $(TRAFODION_VER)"
mkdir -p distribution
- git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD | gzip > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar.gz
+ git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
+ tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar $^
+ gzip distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
+
+$(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE:
+ cd licenses && $(MAKE) LICENSE-src
+ mkdir -p $(@D)
+ cp licenses/LICENSE-src $@
eclipse:
@echo "Making eclipse projects for Trafodion components"
@@ -48,6 +55,8 @@ eclipse:
clean:
@echo "Removing Trafodion objects"
cd core && $(MAKE) clean
+ cd licenses && $(MAKE) clean
+ rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
cleanall:
@echo "Removing all Trafodion objects"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ff36a82..4b11f9a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Trafodion
-Copyright 2015 The Apache Software Foundation
+Copyright 2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/README
----------------------------------------------------------------------
diff --git a/README b/README
index 8df03c0..256588a 100644
--- a/README
+++ b/README
@@ -13,10 +13,10 @@ To get started using Apache Trafodion:
- documentation for this release can be viewed on the Apache Trafodion
wiki page:
- https://cwiki.apache.org/confluence/display/TRAFODION/Documentation
+ http://trafodion.incubator.apache.org/documentation.html
- - release notes describing changes for release 1.3.0 can be viewed:
- https://cwiki.apache.org/confluence/display/TRAFODION/Software
+ - release notes describing changes for particular releases can be viewed:
+ http://trafodion.apache.org/release-notes.html
- the latest Apache Trafodion can be downloaded from Apache incubator
distribution site or accessed from git
@@ -29,7 +29,7 @@ To get started using Apache Trafodion:
- To build and try out Apache Trafodion, please following our build
instructions as described:
- https://cwiki.apache.org/confluence/display/TRAFODION/Using+the+Software
+ https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Contributor+Guide
=============================
Cryptographic software notice
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/core/conn/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/Makefile b/core/conn/Makefile
index fea299f..a57bbb1 100644
--- a/core/conn/Makefile
+++ b/core/conn/Makefile
@@ -34,8 +34,18 @@ endif
.PHONY: all
all: pkg-clients
-pkg-clients:
+pkg-clients: clients/LICENSE clients/NOTICE
tar -zcvf $(CLIENT_TAR) clients
+
+clients/LICENSE: ../../licenses/LICENSE-clients
+ cp -f $? $@
+
+../../licenses/LICENSE-clients:
+ cd $(@D) && $(MAKE) $(@F)
+
+clients/NOTICE: ../../NOTICE
+ cp -f $? $@
+
clean:
$(RM) -rf $(MY_SQROOT)/../conn/clients
$(RM) -f $(MY_SQROOT)/../conn/*.mf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/core/rest/.gitignore
----------------------------------------------------------------------
diff --git a/core/rest/.gitignore b/core/rest/.gitignore
index b83d222..a13c18a 100644
--- a/core/rest/.gitignore
+++ b/core/rest/.gitignore
@@ -1 +1,3 @@
/target/
+/LICENSE
+/NOTICE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/core/rest/Makefile
----------------------------------------------------------------------
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 9a2a1be..539aa49 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -31,8 +31,7 @@ GENVERS =./genvers
all: build_all
-build_all:
- $(MAKE) build_chk
+build_all: build_chk LICENSE NOTICE
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'
@@ -50,3 +49,13 @@ clean:
$(RM) build_rest.log
$(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 $? $@
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/core/rest/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/core/rest/src/assembly/all.xml b/core/rest/src/assembly/all.xml
index d228092..07ac044 100644
--- a/core/rest/src/assembly/all.xml
+++ b/core/rest/src/assembly/all.xml
@@ -35,6 +35,14 @@ http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifi
<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/d6830446/core/sqf/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/.gitignore b/core/sqf/.gitignore
index c5cca17..336976b 100644
--- a/core/sqf/.gitignore
+++ b/core/sqf/.gitignore
@@ -64,3 +64,6 @@ Linux-x86_64/
/hbase_utilities/src/main/resources/
/hbase_utilities/target/
+# derived license
+/LICENSE
+/NOTICE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 29ccc89..4298584 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -282,6 +282,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_DIRS ?= sql export
PKG_BIN_DIRS += trafci
@@ -308,6 +309,15 @@ package: pkglist-files pkglist-symlinks tmp/sqenv.sh
gzip -c $(PKG_TAR_UN) > $(PKG_TAR)
rm -f $(PKG_TAR_UN) pkglist-files pkglist-symlinks tmp/sqenv.sh
+LICENSE: ../../licenses/LICENSE-server
+ cp -f $? $@
+
+../../licenses/LICENSE-server:
+ cd $(@D) && $(MAKE) $(@F)
+
+NOTICE: ../../NOTICE
+ cp -f $? $@
+
tmp/sqenv.sh:
@if [ ! -d tmp ]; then mkdir tmp; fi
echo "export SQ_BUILD_TYPE=$(SQ_BUILD_TYPE)" > tmp/sqenv.sh
@@ -316,7 +326,7 @@ tmp/sqenv.sh:
cat $(SQENV_MTYPE) >> tmp/sqenv.sh
# regular directories and files, following symlinks, minus simple links
-pkglist-files: pkglist-symlinks
+pkglist-files: pkglist-symlinks LICENSE NOTICE
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 /)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/dcs/.gitignore
----------------------------------------------------------------------
diff --git a/dcs/.gitignore b/dcs/.gitignore
index aa3579f..3d4a1ea 100644
--- a/dcs/.gitignore
+++ b/dcs/.gitignore
@@ -2,3 +2,5 @@ mvn.out
target/*
/target/
*.log
+/LICENSE
+/NOTICE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/dcs/Makefile
----------------------------------------------------------------------
diff --git a/dcs/Makefile b/dcs/Makefile
index 144e763..715e6ed 100644
--- a/dcs/Makefile
+++ b/dcs/Makefile
@@ -31,8 +31,7 @@ GENVERS =./genvers
all: build_all
-build_all:
- $(MAKE) build_chk
+build_all: build_chk LICENSE NOTICE
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'
@@ -45,8 +44,17 @@ 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 $? $@
+
clean:
-$(MAVEN) clean | grep ERROR
$(RM) build_dcs.log
- $(RM) $(VFILE)
+ $(RM) $(VFILE) LICENSE NOTICE
$(RM) ../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_DCS_TARNAME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/dcs/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/dcs/src/assembly/all.xml b/dcs/src/assembly/all.xml
index 57c9555..34f2636 100644
--- a/dcs/src/assembly/all.xml
+++ b/dcs/src/assembly/all.xml
@@ -36,8 +36,8 @@
<fileSets>
<fileSet>
<includes>
- <include>${project.basedir}/NOTICE.txt</include>
- <include>${project.basedir}/LICENSE.txt</include>
+ <include>${project.basedir}/NOTICE</include>
+ <include>${project.basedir}/LICENSE</include>
</includes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/install/.gitignore
----------------------------------------------------------------------
diff --git a/install/.gitignore b/install/.gitignore
index 3c14da4..4b2ae36 100644
--- a/install/.gitignore
+++ b/install/.gitignore
@@ -1 +1,3 @@
installer-*.tar.gz
+LICENSE
+NOTICE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 3ddc671..edb5dd2 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -26,9 +26,18 @@ RELEASE_VER ?= 1.0.0_v002
all: pkg-installer
-pkg-installer:
+pkg-installer: installer/LICENSE installer/NOTICE
tar czf installer-$(RELEASE_VER).tar.gz installer
+installer/LICENSE: ../licenses/LICENSE-install
+ cp -f $? $@
+
+../licenses/LICENSE-install:
+ cd $(@D) && $(MAKE) $(@F)
+
+installer/NOTICE: ../NOTICE
+ cp -f $? $@
+
version:
@echo "$(RELEASE_VER)"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/Apache
----------------------------------------------------------------------
diff --git a/licenses/Apache b/licenses/Apache
new file mode 100644
index 0000000..cbe7432
--- /dev/null
+++ b/licenses/Apache
@@ -0,0 +1,203 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+===============================================================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/LICENSE-bsd3
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-bsd3 b/licenses/LICENSE-bsd3
deleted file mode 100644
index 926729e..0000000
--- a/licenses/LICENSE-bsd3
+++ /dev/null
@@ -1,14 +0,0 @@
-This code is derived from software contributed to Berkeley by
- Kent Williams and Tom Epperly.
-
- Redistribution and use in source and binary forms with or without
- modification are permitted provided that: (1) source distributions retain
- this entire copyright notice and comment, and (2) distributions including
- binaries display the following acknowledgement: ``This product includes
- software developed by the University of California, Berkeley and its
- contributors'' in the documentation or other materials provided with the
- distribution and in all advertising materials mentioning features or use
- of this software. Neither the name of the University nor the names of
- its contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/LICENSE-bsd4
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-bsd4 b/licenses/LICENSE-bsd4
deleted file mode 100644
index d952398..0000000
--- a/licenses/LICENSE-bsd4
+++ /dev/null
@@ -1,34 +0,0 @@
- Copyright (c) 1990, 1993
- The Regents of the University of California. All rights reserved.
-
- This code is derived from software contributed to Berkeley by
- Chris Torek.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the University of
- California, Berkeley and its contributors.
- 4. Neither the name of the University 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 REGENTS 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.
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/LICENSE-facebook
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-facebook b/licenses/LICENSE-facebook
deleted file mode 100644
index b9dcbaa..0000000
--- a/licenses/LICENSE-facebook
+++ /dev/null
@@ -1,14 +0,0 @@
-Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- @author: Andrei Alexandrescu (aalexandre)
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/LICENSE-jquery
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-jquery b/licenses/LICENSE-jquery
deleted file mode 100644
index b8fc975..0000000
--- a/licenses/LICENSE-jquery
+++ /dev/null
@@ -1,8 +0,0 @@
-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/d6830446/licenses/LICENSE-js
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-js b/licenses/LICENSE-js
deleted file mode 100644
index fe7c6cb..0000000
--- a/licenses/LICENSE-js
+++ /dev/null
@@ -1,21 +0,0 @@
-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.
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/LICENSE-salesforce
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-salesforce b/licenses/LICENSE-salesforce
deleted file mode 100644
index 7e9d415..0000000
--- a/licenses/LICENSE-salesforce
+++ /dev/null
@@ -1,23 +0,0 @@
-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 Salesforce.com nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
new file mode 100644
index 0000000..6760eef
--- /dev/null
+++ b/licenses/Makefile
@@ -0,0 +1,46 @@
+# @@@ 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 @@@
+
+all: LICENSE-src LICENSE-dcs LICENSE-server LICENSE-install LICENSE-rest LICENSE-clients
+
+# All source code included in Trafodion source
+LICENSE-src:
+ cat Apache lic-components-src lic-dcs-src lic-server-src lic-test-src > $@
+
+# Binary licenses for each separtely 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 > $@
+
+LICENSE-install:
+ cat Apache > $@
+
+LICENSE-rest:
+ cat Apache lic-rest-bin > $@
+
+LICENSE-clients:
+ cat Apache lic-clients-bin > $@
+
+clean:
+ rm LICENSE*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-clients-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-clients-bin b/licenses/lic-clients-bin
new file mode 100644
index 0000000..f030b0a
--- /dev/null
+++ b/licenses/lic-clients-bin
@@ -0,0 +1,25 @@
+===============================================================================
+To Do:
+
+Investigate and document third-pary licenses for SW bundled with binaries
+for each of these client components:
+
+JDBCT4.zip
+ lib/jdbcT4.jar
+
+odb64_linux.tar.gz
+ bin/odb64luo
+
+trafci.zip
+ trafciInstaller.jar
+
+TRAF_ODBC_Linux_Driver_64.tar.gz
+ libicu*Nv44.so.44 - ICU http://source.icu-project.org/repos/icu/icu/trunk/license.html
+ statically linked libraries:
+ /usr/lib64/libssl.a
+ /usr/lib64/libcrypto.a
+
+win-odbc
+ TFODBC64-*.exe
+
++++++++++++++++++++++++++++++
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-components-src
----------------------------------------------------------------------
diff --git a/licenses/lic-components-src b/licenses/lic-components-src
new file mode 100644
index 0000000..7f633a4
--- /dev/null
+++ b/licenses/lic-components-src
@@ -0,0 +1,9 @@
+===============================================================================
+
+APACHE TRAFODION SUBCOMPONENTS:
+
+Apache Trafodion includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following licenses.
+
+===============================================================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-dcs-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-dcs-bin b/licenses/lic-dcs-bin
new file mode 100644
index 0000000..fdd52ed
--- /dev/null
+++ b/licenses/lic-dcs-bin
@@ -0,0 +1,9 @@
+===============================================================================
+To Do:
+
+Need to investigate and document licenses for software bundled in:
+
+dcs-2.0.0.jar
+lib/*.jar
+
++++++++++++++++++++++++++++++
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-dcs-src
----------------------------------------------------------------------
diff --git a/licenses/lic-dcs-src b/licenses/lic-dcs-src
new file mode 100644
index 0000000..8db2d9a
--- /dev/null
+++ b/licenses/lic-dcs-src
@@ -0,0 +1,69 @@
+===============================================================================
+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/d6830446/licenses/lic-rest-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-rest-bin b/licenses/lic-rest-bin
new file mode 100644
index 0000000..2cf61b9
--- /dev/null
+++ b/licenses/lic-rest-bin
@@ -0,0 +1,9 @@
+===============================================================================
+To Do:
+
+Need to investigate and document licenses for software bundled in:
+
+rest-2.0.0.jar
+lib/*.jar
+
++++++++++++++++++++++++++++++
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-server-bin
----------------------------------------------------------------------
diff --git a/licenses/lic-server-bin b/licenses/lic-server-bin
new file mode 100644
index 0000000..d1e8411
--- /dev/null
+++ b/licenses/lic-server-bin
@@ -0,0 +1,135 @@
+===============================================================================
+
+The binary distribution of Apache Trafodion bundles MPICH software which is
+available under a BSD like license. (http://www.mpich.org/)
+
+ COPYRIGHT
+
+ The following is a notice of limited availability of the code, and disclaimer
+ which must be included in the prologue of the code and in all source listings
+ of the code.
+
+ Copyright Notice
+ + 2002 University of Chicago
+
+ Permission is hereby granted to use, reproduce, prepare derivative works, and
+ to redistribute to others. This software was authored by:
+
+ Mathematics and Computer Science Division
+ Argonne National Laboratory, Argonne IL 60439
+
+ (and)
+
+ Department of Computer Science
+ University of Illinois at Urbana-Champaign
+
+
+ GOVERNMENT LICENSE
+
+ Portions of this material resulted from work developed under a U.S.
+ Government Contract and are subject to the following license: the Government
+ is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+ irrevocable worldwide license in this computer software to reproduce, prepare
+ derivative works, and perform publicly and display publicly.
+
+ DISCLAIMER
+
+ This computer code material was prepared, in part, as an account of work
+ sponsored by an agency of the United States Government. Neither the United
+ States, nor the University of Chicago, nor any of their employees, makes any
+ warranty express or implied, or assumes any legal liability or responsibility
+ for the accuracy, completeness, or usefulness of any information, apparatus,
+ product, or process disclosed, or represents that its use would not infringe
+ privately owned rights.
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion bundles Udis86 software which is
+available under a BSD 2-clause license. (http://udis86.sourceforge.net/)
+
+ Copyright (c) 2002-2012, Vivek Thampi <vi...@gmail.com>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
++++++++++++++++++++++++++++++
+
+The binary distribution of Apache Trafodion bundles LLVM software which is
+available under a University of Illinois/NCSA license. (http://llvm.org/)
+
+ University of Illinois/NCSA
+ Open Source License
+
+ Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign.
+ All rights reserved.
+
+ Developed by:
+
+ LLVM Team
+
+ University of Illinois at Urbana-Champaign
+
+ http://llvm.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal with
+ 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:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimers.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimers in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the names of the LLVM Team, University of Illinois at
+ Urbana-Champaign, nor the names of its contributors may be used to
+ endorse or promote products derived from this Software without specific
+ prior written permission.
+
+ 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
+ CONTRIBUTORS 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 WITH THE
+ SOFTWARE.
+
++++++++++++++++++++++++++++++
+
+To Do:
+
+Need to investigate and add info regarding third-party software bundled into jars:
+
+./export/lib/jdbcT2.jar
+./export/lib/jdbcT4.jar
+./export/lib/hbase-trx-hbase_98_4-2.0.0.jar
+./export/lib/hbase-trx-cdh5_3-2.0.0.jar
+./export/lib/hbase-trx-hdp2_2-2.0.0.jar
+./export/lib/sqmanvers.jar
+./export/lib/trafodion-sql-2.0.0.jar
+./export/lib/trafodion-utility-2.0.0.jar
+./export/lib/trafodion-dtm-2.0.0.jar
+./trafci/lib/trafci.jar
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
new file mode 100644
index 0000000..6e34cbd
--- /dev/null
+++ b/licenses/lic-server-src
@@ -0,0 +1,76 @@
+===============================================================================
+The core component of Apache Trafodion uses several BSD-like and MIT-like licenses:
+
++++++++++++++++++++++++++++++
+
+BSD-4 clause for files:
+ incubator-trafodion/core/sql/common/swsprintf.cpp
+ incubator-trafodion/core/sql/common/swscanf.cpp
+
+ Copyright (c) 1990 The Regents of the University of California.
+ Copyright (c) 1990, 1993 The Regents of the University of California.
+ This code is derived from software contributed to Berkeley by Chris Torek.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ 4. Neither the name of the University 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 REGENTS 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.
+
++++++++++++++++++++++++++++++
+
+BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h
+
+ Copyright (c) 1993 The Regents of the University of California.
+
+ This code is derived from software contributed to Berkeley by
+ Kent Williams and Tom Epperly.
+
+ Redistribution and use in source and binary forms with or without
+ modification are permitted provided that: (1) source distributions retain
+ this entire copyright notice and comment, and (2) distributions including
+ binaries display the following acknowledgement: ``This product includes
+ software developed by the University of California, Berkeley and its
+ contributors'' in the documentation or other materials provided with the
+ distribution and in all advertising materials mentioning features or use
+ of this software. Neither the name of the University nor the names of
+ its contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
++++++++++++++++++++++++++++++
+
+MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat
+
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ and Clark Cooper
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+ Copyright 2000, Clark Cooper
+
+ For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING
+
++++++++++++++++++++++++++++++
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d6830446/licenses/lic-test-src
----------------------------------------------------------------------
diff --git a/licenses/lic-test-src b/licenses/lic-test-src
new file mode 100644
index 0000000..e60863d
--- /dev/null
+++ b/licenses/lic-test-src
@@ -0,0 +1,43 @@
+===============================================================================
+Software used to test Apache Trafodion bundles source with BSD-like licenses:
+
+BSD-3 clause for files in:
+ incubator-trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end
+
+Apache Trafodion changed these files to work within its test environment
+
+ Copyright (c) 2013, Salesforce.com, Inc.
+
+ 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 Salesforce.com nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
++++++++++++++++++++++++++++++
+
+As part of testing large objects (LOBs), the testware needs some object files.
+Two pictures were donated for this purpose by Christophe LeRouzo. He has
+formally given Apache Trafodion to permission to use these picturs.
+
+ incubator-trafodion/core/sql/regress/executor/anoush.jpg
+ incubator-trafodion/core/sql/regress/executor/deep.jpg
+
++++++++++++++++++++++++++++++
[3/3] incubator-trafodion git commit: Merge [TRAFODION-1835] PR 329
Refactor license files
Posted by db...@apache.org.
Merge [TRAFODION-1835] PR 329 Refactor license files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/611b5563
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/611b5563
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/611b5563
Branch: refs/heads/master
Commit: 611b5563ddeeae7da5d0bc4f5dda43488a5ba994
Parents: 766c62e 947428a
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Feb 22 16:51:05 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Feb 22 16:51:05 2016 +0000
----------------------------------------------------------------------
.gitattributes | 3 -
.gitignore | 3 +
.rat-excludes | 6 +-
LICENSE | 305 ------------------------------------
Makefile | 13 +-
NOTICE | 2 +-
README | 8 +-
core/conn/Makefile | 12 +-
core/rest/.gitignore | 2 +
core/rest/Makefile | 13 +-
core/rest/src/assembly/all.xml | 8 +
core/sqf/.gitignore | 3 +
core/sqf/Makefile | 12 +-
dcs/.gitignore | 2 +
dcs/Makefile | 14 +-
dcs/src/assembly/all.xml | 4 +-
install/.gitignore | 2 +
install/Makefile | 11 +-
licenses/Apache | 203 ++++++++++++++++++++++++
licenses/LICENSE-bsd3 | 14 --
licenses/LICENSE-bsd4 | 34 ----
licenses/LICENSE-facebook | 14 --
licenses/LICENSE-jquery | 8 -
licenses/LICENSE-js | 21 ---
licenses/LICENSE-salesforce | 23 ---
licenses/Makefile | 46 ++++++
licenses/lic-clients-bin | 25 +++
licenses/lic-components-src | 9 ++
licenses/lic-dcs-bin | 9 ++
licenses/lic-dcs-src | 69 ++++++++
licenses/lic-rest-bin | 9 ++
licenses/lic-server-bin | 135 ++++++++++++++++
licenses/lic-server-src | 76 +++++++++
licenses/lic-test-src | 43 +++++
34 files changed, 718 insertions(+), 443 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: [TRAFODION-1835] Fix makefile
dependency bug and comment typo.
Posted by db...@apache.org.
[TRAFODION-1835] Fix makefile dependency bug and comment 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/947428a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/947428a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/947428a8
Branch: refs/heads/master
Commit: 947428a839d2f6f67d41d1b34c8b93b2bcaeeb31
Parents: d683044
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Feb 19 01:13:38 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Feb 19 01:13:38 2016 +0000
----------------------------------------------------------------------
core/sqf/Makefile | 4 ++--
licenses/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/947428a8/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 4298584..873da82 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -326,11 +326,11 @@ tmp/sqenv.sh:
cat $(SQENV_MTYPE) >> tmp/sqenv.sh
# regular directories and files, following symlinks, minus simple links
-pkglist-files: pkglist-symlinks LICENSE NOTICE
+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:
+pkglist-symlinks: LICENSE NOTICE
find $(PKG_BIN_OBJS) -lname '[^./]*' > $@
# Targets to tar/gzip the self installer
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/947428a8/licenses/Makefile
----------------------------------------------------------------------
diff --git a/licenses/Makefile b/licenses/Makefile
index 6760eef..597c080 100644
--- a/licenses/Makefile
+++ b/licenses/Makefile
@@ -25,7 +25,7 @@ all: LICENSE-src LICENSE-dcs LICENSE-server LICENSE-install LICENSE-rest LICENSE
LICENSE-src:
cat Apache lic-components-src lic-dcs-src lic-server-src lic-test-src > $@
-# Binary licenses for each separtely packaged component
+# 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 > $@