Repository: geode Updated Branches: refs/heads/next-gen-native-client-software-grant c2761c0ff -> 3860832ab
GEODE-1435: Correct licensing on ANTLR files. - Add license for C++ parser. - Remove verbose public domain statement for ANTLR. - Remove Apache header from public domain files. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/0347dfbf Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0347dfbf Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0347dfbf Branch: refs/heads/next-gen-native-client-software-grant Commit: 0347dfbf25110809c74094c6b8fa2942e450a629 Parents: 12ccffa Author: Jacob Barrett <jbarr...@pivotal.io> Authored: Tue Jan 31 17:22:48 2017 -0800 Committer: Anthony Baker <aba...@apache.org> Committed: Fri Feb 3 12:52:34 2017 -0800 ---------------------------------------------------------------------- LICENSE | 10 ++++++ NOTICE | 3 -- dist/LICENSE | 36 +++----------------- dist/NOTICE | 3 -- .../impl/CPPParser/CPPDictionary.hpp | 16 --------- .../impl/CPPParser/CPPSymbol.hpp | 16 --------- .../impl/CPPParser/DictEntry.hpp | 16 --------- .../impl/CPPParser/Dictionary.cpp | 16 --------- .../impl/CPPParser/Dictionary.hpp | 16 --------- .../impl/CPPParser/Support.cpp | 16 --------- 10 files changed, 15 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 2d176dc..81d5672 100644 --- a/LICENSE +++ b/LICENSE @@ -245,3 +245,13 @@ 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. + + +--------------------------------------------------------------------------- +Public Domain +--------------------------------------------------------------------------- + +Apache Geode bundles the following files, which are available in the public +domain: + + - PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (http://www.antlr2.org/) http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index d3b77a3..68b6289 100644 --- a/NOTICE +++ b/NOTICE @@ -3,6 +3,3 @@ 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/0347dfbf/dist/LICENSE ---------------------------------------------------------------------- diff --git a/dist/LICENSE b/dist/LICENSE index b73dd07..5a9b88a 100644 --- a/dist/LICENSE +++ b/dist/LICENSE @@ -352,39 +352,13 @@ 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) +Public Domain --------------------------------------------------------------------------- -Apache Geode bundles the following files under the ANTLR 2 License: +Apache Geode bundles the following files, which are available in the public +domain: - 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 -pa...@cs.usfca.edu -pa...@antlr.org + - PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (http://www.antlr2.org/) http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/dist/NOTICE ---------------------------------------------------------------------- diff --git a/dist/NOTICE b/dist/NOTICE index d3b77a3..68b6289 100644 --- a/dist/NOTICE +++ b/dist/NOTICE @@ -3,6 +3,3 @@ 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/0347dfbf/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp b/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp index 508ae34..81f01c7 100644 --- a/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp +++ b/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp @@ -1,20 +1,4 @@ /* - * 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. - */ -/* * PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (cplusplus.g, stat.g, expr.g) * * Authors: Sumana Srinivasan, NeXT Inc.; sumana_sriniva...@next.com http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/src/pdxautoserializer/impl/CPPParser/CPPSymbol.hpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/impl/CPPParser/CPPSymbol.hpp b/src/pdxautoserializer/impl/CPPParser/CPPSymbol.hpp index 82ce94f..7611e11 100644 --- a/src/pdxautoserializer/impl/CPPParser/CPPSymbol.hpp +++ b/src/pdxautoserializer/impl/CPPParser/CPPSymbol.hpp @@ -1,20 +1,4 @@ /* - * 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. - */ -/* * PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (cplusplus.g, stat.g, expr.g) * * Authors: Sumana Srinivasan, NeXT Inc.; sumana_sriniva...@next.com http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/src/pdxautoserializer/impl/CPPParser/DictEntry.hpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/impl/CPPParser/DictEntry.hpp b/src/pdxautoserializer/impl/CPPParser/DictEntry.hpp index 1b38328..16f5594 100644 --- a/src/pdxautoserializer/impl/CPPParser/DictEntry.hpp +++ b/src/pdxautoserializer/impl/CPPParser/DictEntry.hpp @@ -1,20 +1,4 @@ /* - * 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. - */ -/* * PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (cplusplus.g, stat.g, expr.g) * * Authors: Sumana Srinivasan, NeXT Inc.; sumana_sriniva...@next.com http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/src/pdxautoserializer/impl/CPPParser/Dictionary.cpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/impl/CPPParser/Dictionary.cpp b/src/pdxautoserializer/impl/CPPParser/Dictionary.cpp index 85a26f6..ea78a3c 100644 --- a/src/pdxautoserializer/impl/CPPParser/Dictionary.cpp +++ b/src/pdxautoserializer/impl/CPPParser/Dictionary.cpp @@ -1,20 +1,4 @@ /* - * 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. - */ -/* * PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (cplusplus.g, stat.g, expr.g) * * Authors: Sumana Srinivasan, NeXT Inc.; sumana_sriniva...@next.com http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/src/pdxautoserializer/impl/CPPParser/Dictionary.hpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/impl/CPPParser/Dictionary.hpp b/src/pdxautoserializer/impl/CPPParser/Dictionary.hpp index 17bdaa7..d5b6c40 100644 --- a/src/pdxautoserializer/impl/CPPParser/Dictionary.hpp +++ b/src/pdxautoserializer/impl/CPPParser/Dictionary.hpp @@ -1,20 +1,4 @@ /* - * 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. - */ -/* * PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (cplusplus.g, stat.g, expr.g) * * Authors: Sumana Srinivasan, NeXT Inc.; sumana_sriniva...@next.com http://git-wip-us.apache.org/repos/asf/geode/blob/0347dfbf/src/pdxautoserializer/impl/CPPParser/Support.cpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/impl/CPPParser/Support.cpp b/src/pdxautoserializer/impl/CPPParser/Support.cpp index f39dc46..9ba33b3 100644 --- a/src/pdxautoserializer/impl/CPPParser/Support.cpp +++ b/src/pdxautoserializer/impl/CPPParser/Support.cpp @@ -1,20 +1,4 @@ /* - * 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. - */ -/* * PUBLIC DOMAIN PCCTS-BASED C++ GRAMMAR (cplusplus.g, stat.g, expr.g) * * Authors: Sumana Srinivasan, NeXT Inc.; sumana_sriniva...@next.com
