geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [2/3] geode git commit: GEODE-1435: Adds binary distribution licensing.
Date Fri, 03 Feb 2017 20:53:23 GMT
GEODE-1435: Adds binary distribution licensing.

* Adds binary licensing to binary package.
* Corrects error in source LICENSE file.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/12ccffae
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/12ccffae
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/12ccffae

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 12ccffae8bbddf239c816e1097c3abe56107cad3
Parents: c2761c0
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Tue Jan 31 15:25:15 2017 -0800
Committer: Anthony Baker <abaker@apache.org>
Committed: Fri Feb 3 12:52:34 2017 -0800

----------------------------------------------------------------------
 LICENSE            |   3 -
 NOTICE             |   3 +
 dist/LICENSE       | 390 ++++++++++++++++++++++++++++++++++++++++++++++++
 dist/NOTICE        |   8 +
 src/CMakeLists.txt |   4 +-
 5 files changed, 404 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/12ccffae/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index aa346eb..2d176dc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -218,9 +218,6 @@ Apache Geode bundles the following files under the BSD 3-Clause License:
   - MersenneTwister.*pp (ihttp://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html),
     Copyright (c) 1997-2002, Makoto Matsumoto and Takuji Nishimura
     Copyright (c) 2000-2003, Richard J. Wagner
-  - FindCPPCache.cmake (https://cmake.org),
-    Copyright 2006-2009 Kitware, Inc.
-    Copyright 2006 Alexander Neundorf <neundorf@kde.org>
 
 All rights reserved.
 

http://git-wip-us.apache.org/repos/asf/geode/blob/12ccffae/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 68b6289..d3b77a3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,3 +3,6 @@ Copyright 2017 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software from the
+ANTLRv2 Project (http://www.antlr2.org).

http://git-wip-us.apache.org/repos/asf/geode/blob/12ccffae/dist/LICENSE
----------------------------------------------------------------------
diff --git a/dist/LICENSE b/dist/LICENSE
new file mode 100644
index 0000000..b73dd07
--- /dev/null
+++ b/dist/LICENSE
@@ -0,0 +1,390 @@
+                                 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 Geode Native Client Subcomponents
+===========================================================================
+
+Apache Geode Native Client includes a number of components and libraries
+with separate copyright notices and license terms. Your use of those
+components are subject to the terms and conditions of the following
+licenses.
+
+
+----------------------------------------------------------------------------
+The DOC Software License (http://www.cs.wustl.edu/~schmidt/ACE-copying.html)
+----------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the DOC Software License:
+
+  - ACE (http://www.cs.wustl.edu/~schmidt/ACE.html)
+  
+[1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM)
+(henceforth referred to as "DOC software") are copyrighted by
+[5]Douglas C. Schmidt and his [6]research group at [7]Washington
+University, [8]University of California, Irvine, and [9]Vanderbilt
+University, Copyright (c) 1993-2017, all rights reserved. Since DOC
+software is open-source, freely available software, you are free to
+use, modify, copy, and distribute--perpetually and irrevocably--the
+DOC software source code and object code produced from the source, as
+well as copy and distribute modified versions of this software. You
+must, however, include this copyright statement along with any code
+built using DOC software that you release. No copyright statement
+needs to be provided if you just ship binary executables of your
+software products.
+
+You can use DOC software in commercial and/or binary software releases
+and are under no obligation to redistribute any of your source code
+that is built using DOC software. Note, however, that you may not
+misappropriate the DOC software code, such as copyrighting it yourself
+or claiming authorship of the DOC software code, in a way that will
+prevent DOC software from being distributed freely using an
+open-source development model. You needn't inform anyone that you're
+using DOC software in your software, though we encourage you to let
+[10]us know so we can promote your project in the [11]DOC software
+success stories.
+
+The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites
+are maintained by the [17]DOC Group at the [18]Institute for Software
+Integrated Systems (ISIS) and the [19]Center for Distributed Object
+Computing of Washington University, St. Louis for the development of
+open-source software as part of the open-source software community.
+Submissions are provided by the submitter ``as is'' with no warranties
+whatsoever, including any warranty of merchantability, noninfringement
+of third party intellectual property, or fitness for any particular
+purpose. In no event shall the submitter be liable for any direct,
+indirect, special, exemplary, punitive, or consequential damages,
+including without limitation, lost profits, even if advised of the
+possibility of such damages. Likewise, DOC software is provided as is
+with no warranties of any kind, including the warranties of design,
+merchantability, and fitness for a particular purpose,
+noninfringement, or arising from a course of dealing, usage or trade
+practice. Washington University, UC Irvine, Vanderbilt University,
+their employees, and students shall have no liability with respect to
+the infringement of copyrights, trade secrets or any patents by DOC
+software or any part thereof. Moreover, in no event will Washington
+University, UC Irvine, or Vanderbilt University, their employees, or
+students be liable for any lost revenue or profits or other special,
+indirect and consequential damages.
+
+DOC software is provided with no support and without any obligation on
+the part of Washington University, UC Irvine, Vanderbilt University,
+their employees, or students to assist in its use, correction,
+modification, or enhancement. A [20]number of companies around the
+world provide commercial support for DOC software, however. DOC
+software is Y2K-compliant, as long as the underlying OS platform is
+Y2K-compliant. Likewise, DOC software is compliant with the new US
+daylight savings rule passed by Congress as "The Energy Policy Act of
+2005," which established new daylight savings times (DST) rules for
+the United States that expand DST as of March 2007. Since DOC software
+obtains time/date and calendaring information from operating systems
+users will not be affected by the new DST rules as long as they
+upgrade their operating systems accordingly.
+
+The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM),
+Washington University, UC Irvine, and Vanderbilt University, may not
+be used to endorse or promote products or services derived from this
+source without express written permission from Washington University,
+UC Irvine, or Vanderbilt University. This license grants no permission
+to call products or services derived from this source ACE(TM),
+TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant
+permission for the name Washington University, UC Irvine, or
+Vanderbilt University to appear in their names.
+
+If you have any suggestions, additions, comments, or questions, please
+let [21]me know.
+
+[22]Douglas C. Schmidt
+  _________________________________________________________________
+
+Back to the [23]ACE home page.
+
+References
+
+   1. http://www.cs.wustl.edu/~schmidt/ACE.html
+   2. http://www.cs.wustl.edu/~schmidt/TAO.html
+   3. http://www.dre.vanderbilt.edu/CIAO/
+   4. http://www.dre.vanderbilt.edu/cosmic/
+   5. http://www.dre.vanderbilt.edu/~schmidt/
+   6. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+   7. http://www.wustl.edu/
+   8. http://www.uci.edu/
+   9. http://www.vanderbilt.edu/
+  10. mailto:doc_group@cs.wustl.edu
+  11. http://www.cs.wustl.edu/~schmidt/ACE-users.html
+  12. http://www.cs.wustl.edu/~schmidt/ACE.html
+  13. http://www.cs.wustl.edu/~schmidt/TAO.html
+  14. http://www.dre.vanderbilt.edu/CIAO/
+  15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/
+  16. http://www.dre.vanderbilt.edu/cosmic/
+  17. http://www.dre.vanderbilt.edu/
+  18. http://www.isis.vanderbilt.edu/
+  19. http://www.cs.wustl.edu/~schmidt/doc-center.html
+  20. http://www.cs.wustl.edu/~schmidt/commercial-support.html
+  21. mailto:d.schmidt@vanderbilt.edu
+  22. http://www.dre.vanderbilt.edu/~schmidt/
+  23. http://www.cs.wustl.edu/ACE.html
+
+
+---------------------------------------------------------------------------
+The MIT License (http://opensource.org/licenses/MIT)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the MIT License:
+
+  - libxml2 (http://xmlsoft.org),
+    Copyright (C) 1998-2012 Daniel Veillard.  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.
+
+---------------------------------------------------------------------------
+ANTLR 2 License (http://www.antlr2.org/license.html)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the ANTLR 2 License:
+
+  - ANTLRv2 (http://www.antlr2.org/)
+
+ANTLR 1989-2006 Developed by Terence Parr
+Partially supported by University of San Francisco & jGuru.com
+
+We reserve no legal rights to the ANTLR--it is fully in the
+public domain. An individual or company may do whatever
+they wish with source code distributed with ANTLR or the
+code generated by ANTLR, including the incorporation of
+ANTLR, or its output, into commerical software.
+
+We encourage users to develop software with ANTLR. However,
+we do ask that credit is given to us for developing
+ANTLR. By "credit", we mean that if you use ANTLR or
+incorporate any source code into one of your programs
+(commercial product, research project, or otherwise) that
+you acknowledge this fact somewhere in the documentation,
+research report, etc... If you like ANTLR and have
+developed a nice tool with the output, please mention that
+you developed it using ANTLR. In addition, we ask that the
+headers remain intact in our source code. As long as these
+guidelines are kept, we expect to continue enhancing this
+system and expect to make other tools available as they are
+completed.
+
+The primary ANTLR guy:
+
+Terence Parr
+parrt@cs.usfca.edu
+parrt@antlr.org

http://git-wip-us.apache.org/repos/asf/geode/blob/12ccffae/dist/NOTICE
----------------------------------------------------------------------
diff --git a/dist/NOTICE b/dist/NOTICE
new file mode 100644
index 0000000..d3b77a3
--- /dev/null
+++ b/dist/NOTICE
@@ -0,0 +1,8 @@
+Apache Geode Native Client
+Copyright 2017 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software from the
+ANTLRv2 Project (http://www.antlr2.org).

http://git-wip-us.apache.org/repos/asf/geode/blob/12ccffae/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3266505..71f10af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,7 +71,7 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${PRODUCT_VERSION}-${CPACK_SYS
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
 set(CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_NAME}")
 #set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
-#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../dist/LICENSE")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
 set(CPACK_GENERATOR TGZ;ZIP)
 
@@ -225,6 +225,8 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cppcache/integration-test/keystore
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/xsds/ DESTINATION xsds)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/defaultSystem/ DESTINATION defaultSystem)
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../dist/ DESTINATION .)
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/templates/ DESTINATION templates
   PATTERN "templates/security/CMakeLists.txt" EXCLUDE
   PATTERN "templates/security/CMakeLists.txt.forInstall" EXCLUDE)


Mime
View raw message