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:42 UTC
[08/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/580df31f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/580df31f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/580df31f
Branch: refs/heads/master
Commit: 580df31f795d5e3b16799bc42ad0be2d77e2d7ca
Parents: 190915b
Author: Andy Yang <yo...@esgyn.cn>
Authored: Thu Nov 17 14:21:23 2016 +0800
Committer: Andy Yang <yo...@esgyn.cn>
Committed: Thu Nov 17 14:21:23 2016 +0800
----------------------------------------------------------------------
.rat-excludes | 5 +++++
core/sql/common/ComJSON.cpp | 24 +++++++++++++++++++++++-
core/sql/common/ComJSON.h | 24 +++++++++++++++++++++++-
core/sql/common/ComJSONFuncs.cpp | 24 +++++++++++++++++++++++-
core/sql/common/ComJSONStringInfo.cpp | 25 ++++++++++++++++++++++++-
core/sql/common/ComJSONStringInfo.h | 24 +++++++++++++++++++++++-
6 files changed, 121 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/580df31f/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index feca633..a4fabe3 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -114,6 +114,11 @@ odb.sln
odb.vcxproj.*
odb.rc
# BSD licensed files
+ComJSON.h
+ComJSON.cpp
+ComJSONFuncs.cpp
+ComJSONStringInfo.h
+ComJSONStringInfo.cpp
swscanf.cpp
swsprintf.cpp
ulexer.h
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/580df31f/core/sql/common/ComJSON.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSON.cpp b/core/sql/common/ComJSON.cpp
index 4f7d632..12fd9af 100644
--- a/core/sql/common/ComJSON.cpp
+++ b/core/sql/common/ComJSON.cpp
@@ -3,7 +3,7 @@
* json.c
* JSON data type support.
*
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
@@ -11,6 +11,28 @@
*
*-------------------------------------------------------------------------
*/
+/**********************************************************************
+// @@@ 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 @@@
+**********************************************************************/
#include "ComJSONStringInfo.h"
#include "ComJSON.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/580df31f/core/sql/common/ComJSON.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSON.h b/core/sql/common/ComJSON.h
index e018685..899bb16 100644
--- a/core/sql/common/ComJSON.h
+++ b/core/sql/common/ComJSON.h
@@ -3,13 +3,35 @@
* json.h
* Declarations for JSON data type support.
*
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/include/utils/json.h
*
*-------------------------------------------------------------------------
*/
+ /**********************************************************************
+ // @@@ 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 @@@
+ **********************************************************************/
#ifndef JSON_H
#define JSON_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/580df31f/core/sql/common/ComJSONFuncs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSONFuncs.cpp b/core/sql/common/ComJSONFuncs.cpp
index a2f5490..5711a2e 100644
--- a/core/sql/common/ComJSONFuncs.cpp
+++ b/core/sql/common/ComJSONFuncs.cpp
@@ -3,7 +3,7 @@
* jsonfuncs.c
* Functions to process JSON data types.
*
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
@@ -11,6 +11,28 @@
*
*-------------------------------------------------------------------------
*/
+/**********************************************************************
+// @@@ 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 @@@
+**********************************************************************/
#include "ComJSONStringInfo.h"
#include "ComJSON.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/580df31f/core/sql/common/ComJSONStringInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSONStringInfo.cpp b/core/sql/common/ComJSONStringInfo.cpp
index 312fb00..5a4854f 100644
--- a/core/sql/common/ComJSONStringInfo.cpp
+++ b/core/sql/common/ComJSONStringInfo.cpp
@@ -6,13 +6,36 @@
* It can be used to buffer either ordinary C strings (null-terminated text)
* or arbitrary binary data. All storage is allocated with malloc().
*
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/backend/lib/stringinfo.c
*
*-------------------------------------------------------------------------
*/
+ /**********************************************************************
+ // @@@ 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 @@@
+ **********************************************************************/
+
#include "ComJSONStringInfo.h"
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/580df31f/core/sql/common/ComJSONStringInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComJSONStringInfo.h b/core/sql/common/ComJSONStringInfo.h
index 357e7f5..2136dd1 100644
--- a/core/sql/common/ComJSONStringInfo.h
+++ b/core/sql/common/ComJSONStringInfo.h
@@ -7,13 +7,35 @@
* It can be used to buffer either ordinary C strings (null-terminated text)
* or arbitrary binary data. All storage is allocated with malloc().
*
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/include/lib/stringinfo.h
*
*-------------------------------------------------------------------------
*/
+/**********************************************************************
+// @@@ 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 @@@
+**********************************************************************/
#ifndef STRINGINFO_H
#define STRINGINFO_H