You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/06 14:50:40 UTC
[06/13] incubator-trafodion git commit: jira 2227 update license file
jira 2227 update license file
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1c25e394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1c25e394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1c25e394
Branch: refs/heads/master
Commit: 1c25e394474422fdb7aded891dbd4f9b76388c22
Parents: 4b806d1
Author: Andy Yang <yo...@esgyn.cn>
Authored: Tue Nov 15 15:46:22 2016 +0800
Committer: Andy Yang <yo...@esgyn.cn>
Committed: Tue Nov 15 15:46:22 2016 +0800
----------------------------------------------------------------------
core/sql/common/ComJSON.cpp | 23 -----------------------
core/sql/common/ComJSON.h | 22 ----------------------
core/sql/common/ComJSONFuncs.cpp | 22 ----------------------
core/sql/common/ComJSONStringInfo.cpp | 22 ----------------------
core/sql/common/ComJSONStringInfo.h | 22 ----------------------
licenses/lic-server-src | 29 ++++++++++++++++++++++++++++-
6 files changed, 28 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c25e394/core/sql/common/ComJSON.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSON.cpp b/core/sql/common/ComJSON.cpp
index 1f77d24..4f7d632 100644
--- a/core/sql/common/ComJSON.cpp
+++ b/core/sql/common/ComJSON.cpp
@@ -1,26 +1,3 @@
-/**********************************************************************
-// @@@ 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 @@@
-**********************************************************************/
-
/*-------------------------------------------------------------------------
*
* json.c
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c25e394/core/sql/common/ComJSON.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSON.h b/core/sql/common/ComJSON.h
index d51f366..e018685 100644
--- a/core/sql/common/ComJSON.h
+++ b/core/sql/common/ComJSON.h
@@ -1,25 +1,3 @@
-/**********************************************************************
-// @@@ 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 @@@
-**********************************************************************/
/*-------------------------------------------------------------------------
*
* json.h
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c25e394/core/sql/common/ComJSONFuncs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSONFuncs.cpp b/core/sql/common/ComJSONFuncs.cpp
index f076686..a2f5490 100644
--- a/core/sql/common/ComJSONFuncs.cpp
+++ b/core/sql/common/ComJSONFuncs.cpp
@@ -1,25 +1,3 @@
-/**********************************************************************
-// @@@ 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 @@@
-**********************************************************************/
/*-------------------------------------------------------------------------
*
* jsonfuncs.c
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c25e394/core/sql/common/ComJSONStringInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSONStringInfo.cpp b/core/sql/common/ComJSONStringInfo.cpp
index aa69c31..312fb00 100644
--- a/core/sql/common/ComJSONStringInfo.cpp
+++ b/core/sql/common/ComJSONStringInfo.cpp
@@ -1,25 +1,3 @@
-/**********************************************************************
-// @@@ 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 @@@
-**********************************************************************/
/*-------------------------------------------------------------------------
*
* stringinfo.c
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c25e394/core/sql/common/ComJSONStringInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSONStringInfo.h b/core/sql/common/ComJSONStringInfo.h
index ca9234c..357e7f5 100644
--- a/core/sql/common/ComJSONStringInfo.h
+++ b/core/sql/common/ComJSONStringInfo.h
@@ -1,25 +1,3 @@
-/**********************************************************************
-// @@@ 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 @@@
-**********************************************************************/
/*-------------------------------------------------------------------------
*
* stringinfo.h
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1c25e394/licenses/lic-server-src
----------------------------------------------------------------------
diff --git a/licenses/lic-server-src b/licenses/lic-server-src
index 5ebc75b..dbe56af 100644
--- a/licenses/lic-server-src
+++ b/licenses/lic-server-src
@@ -1,5 +1,5 @@
===============================================================================
-The core component of Apache Trafodion uses several BSD-like and MIT-like licenses:
+The core component of Apache Trafodion uses several BSD-like, MIT-like and PostgreSQL licenses:
+++++++++++++++++++++++++++++
@@ -141,3 +141,30 @@ MIT-Expat for files in:
++++++++++++++++++++++++++++++
+The PostgreSQL Licence (PostgreSQL) for files in:
+ incubator-trafodion/core/sql/common/ComJSON.cpp
+ incubator-trafodion/core/sql/common/ComJSON.h
+ incubator-trafodion/core/sql/common/ComJSONFuncs.cpp
+ incubator-trafodion/core/sql/common/ComJSONStringInfo.cpp
+ incubator-trafodion/core/sql/common/ComJSONStringInfo.h
+
+PostgreSQL License is a liberal Open Source license, similar to the BSD or MIT licenses.
+
+Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+Portions Copyright (c) 1994, Regents of the University of California
+
+Permission to use, copy, modify, and distribute this software and its documentation for
+any purpose, without fee, and without a written agreement is hereby granted, provided that
+the above copyright notice and this paragraph and the following two paragraphs appear
+in all copies.
+
+IN NO EVENT SHALL $ORGANISATION BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF $ORGANISATION HAS BEEN ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+
+$ORGANISATION SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED
+HEREUNDER IS ON AN "AS IS" BASIS, AND $ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+++++++++++++++++++++++++++++++
\ No newline at end of file